Merge branch 'master' of git://github.com/bct/uzbl into experimental

Conflicts:
	uzbl-core.c

1 files changed, 13 insertions, 0 deletions

diff --git a/uzbl-core.h b/uzbl-core.h
index ea78f20..94680c8 100644
--- a/uzbl-core.h
+++ b/uzbl-core.h
@@ -217,6 +217,19 @@ typedef struct {
     gchar* default_value;
 } XDG_Var;
 
+/* uzbl variables */
+enum ptr_type {TYPE_INT, TYPE_STR, TYPE_FLOAT};
+typedef struct {
+    enum ptr_type type;
+    union {
+        int *i;
+        float *f;
+        gchar **s;
+    } ptr;
+    int dump;
+    int writeable;
+    /*@null@*/ void (*func)(void);
+} uzbl_cmdprop;
 
 /* Functions */
 char *