Merge branch 'i3bar_warning_fix'

This commit is contained in:
Axel Wagner 2011-08-10 23:55:20 +02:00
commit 318dfce42f
2 changed files with 2 additions and 2 deletions

View File

@ -21,7 +21,7 @@ TAILQ_HEAD(ws_head, i3_ws);
* Start parsing the received json-string * Start parsing the received json-string
* *
*/ */
void parse_workspaces_json(); void parse_workspaces_json(char *json);
/* /*
* free() all workspace data-structures * free() all workspace data-structures

View File

@ -31,7 +31,7 @@ typedef struct xcb_colors_t xcb_colors_t;
* Initialize xcb and use the specified fontname for text-rendering * Initialize xcb and use the specified fontname for text-rendering
* *
*/ */
char *init_xcb(); char *init_xcb(char *fontname);
/* /*
* Initialize the colors * Initialize the colors