diff options
author | Brendan Taylor <whateley@gmail.com> | 2011-12-13 18:06:37 -0700 |
---|---|---|
committer | Brendan Taylor <whateley@gmail.com> | 2012-01-10 20:24:36 -0700 |
commit | 3d31b1baf6f17c955db018a81aa77efee36f263a (patch) | |
tree | b339c00af2fd4440856244f47f828f807df54de3 /src/uzbl-core.h | |
parent | eff8d68812c996b2ce8cc0747935f702ba64ccf9 (diff) | |
parent | a964be6bd96583f8735fd297856f1c9845850f6a (diff) |
Merge remote-tracking branch 'dylex/master'
Conflicts:
src/uzbl-core.c
Diffstat (limited to 'src/uzbl-core.h')
-rw-r--r-- | src/uzbl-core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/uzbl-core.h b/src/uzbl-core.h index c0d7583..29b7b64 100644 --- a/src/uzbl-core.h +++ b/src/uzbl-core.h @@ -221,7 +221,6 @@ gchar* expand(const char* s, guint recurse); gboolean run_command(const gchar *command, const gchar **args, const gboolean sync, char **output_stdout); void run_command_file(const gchar *path); -void parse_command(const char *cmd, const char *param, GString *result); void parse_cmd_line(const char *ctl_line, GString *result); const CommandInfo * parse_command_parts(const gchar *line, GArray *a); |