Merge remote-tracking branch 'incertia/connect-default'

Conflicts:
	CHANGELOG
This commit is contained in:
James Booth
2014-12-29 15:29:28 +00:00
5 changed files with 81 additions and 8 deletions

View File

@@ -90,6 +90,7 @@ typedef enum {
PREF_AUTOAWAY_MODE,
PREF_AUTOAWAY_MESSAGE,
PREF_CONNECT_ACCOUNT,
PREF_DEFAULT_ACCOUNT,
PREF_LOG_ROTATE,
PREF_LOG_SHARED,
PREF_OTR_LOG,