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

Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
This commit is contained in:
James Booth
2015-01-12 01:12:42 +00:00
11 changed files with 45 additions and 8 deletions

View File

@@ -55,6 +55,7 @@ typedef enum {
PREF_VERCHECK,
PREF_THEME,
PREF_TITLEBAR_SHOW,
PREF_TITLEBAR_GOODBYE,
PREF_FLASH,
PREF_INTYPE,
PREF_HISTORY,