Resolved conflict, indulging new file layout

1 files changed, 17 insertions, 0 deletions

diff --git a/archive/st/patch/xresources.h b/archive/st/patch/xresources.h
new file mode 100644
index 0000000..c184852
--- /dev/null
+++ b/archive/st/patch/xresources.h
@@ -0,0 +1,17 @@
+#include <X11/Xresource.h>
+
+/* Xresources preferences */
+enum resource_type {
+	STRING = 0,
+	INTEGER = 1,
+	FLOAT = 2
+};
+
+typedef struct {
+	char *name;
+	enum resource_type type;
+	void *dst;
+} ResourcePref;
+
+int resource_load(XrmDatabase, char *, enum resource_type, void *);
+void config_init(Display *dpy);