Merge branch 'master' into readline

This commit is contained in:
James Booth
2015-02-08 21:03:26 +00:00
6 changed files with 86 additions and 3 deletions

View File

@@ -131,5 +131,6 @@ int cmp_win_num(gconstpointer a, gconstpointer b);
int get_next_available_win_num(GList *used);
char* get_file_or_linked(char *loc, char *basedir);
char * strip_arg_quotes(const char * const input);
#endif