Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280

This commit is contained in:
James Booth
2015-03-08 21:51:50 +00:00
17 changed files with 167 additions and 2 deletions

View File

@@ -59,6 +59,7 @@ typedef enum {
PREF_FLASH,
PREF_INTYPE,
PREF_HISTORY,
PREF_CARBONS,
PREF_MOUSE,
PREF_OCCUPANTS,
PREF_OCCUPANTS_SIZE,