Merge remote-tracking branch 'incertia/exit-title'

Conflicts: src/command/command.c src/config/preferences.c src/config/preferences.h
2015-01-12 01:12:42 +00:00
parent c64484c6ed 22cc641905
commit 0d0ed9b7ca
11 changed files with 45 additions and 8 deletions
--- a/src/command/commands.h
+++ b/src/command/commands.h
@@ -140,4 +140,4 @@ gboolean cmd_inpblock(gchar **args, struct cmd_help_t help);

 gboolean cmd_form_field(char *tag, gchar **args);

-#endif
+#endif