Merge branch 'helmut' into helmutexp

Conflicts:
	uzbl.c

1 files changed, 2 insertions, 2 deletions

diff --git a/uzbl.h b/uzbl.h
index 440f36c..a8d76eb 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -20,7 +20,7 @@ enum {
 };
 
 const struct {
-    gchar *symbol_name;
+    /*@null@*/ gchar *symbol_name;
     guint symbol_token;
 } symbols[] = {
     {"KEYCMD",               SYM_KEYCMD},
@@ -401,7 +401,7 @@ void
 exec_paramcmd(const Action* act, const guint i);
 
 void
-initialize ();
+initialize (int argc, char *argv[]);
 
 void
 create_browser ();