Merge branch 'master' into otr

Conflicts:
	Makefile.am
This commit is contained in:
James Booth
2014-01-02 01:57:05 +00:00
36 changed files with 2646 additions and 1593 deletions

View File

@@ -46,7 +46,7 @@ typedef struct cmd_t {
gchar** (*parser)(const char * const inp, int min, int max);
int min_args;
int max_args;
void (*setting_func)(void);
void (**setting_func)(void);
CommandHelp help;
} Command;