Merge branch 'master' into chat-sessions

This commit is contained in:
James Booth
2015-01-10 19:23:59 +00:00
2 changed files with 12 additions and 0 deletions

View File

@@ -47,6 +47,8 @@
#define PREFS_MIN_LOG_SIZE 64
#define PREFS_MAX_LOG_SIZE 1048580
// represents all settings in .profrc
// each enum value is mapped to a group and key in .profrc (see preferences.c)
typedef enum {
PREF_SPLASH,
PREF_BEEP,