James Booth 3fd9692aec Merge branch 'master' into pgp		2015-05-04 23:40:58 +01:00
..
account.c	Merge branch 'master' into pgp	2015-05-04 23:40:58 +01:00
account.h	Merge branch 'master' into pgp	2015-04-23 23:48:43 +01:00
accounts.c	Merge branch 'master' into pgp	2015-05-04 23:40:58 +01:00
accounts.h	Added pgpkeyid account setting, send signed presence	2015-03-23 23:38:06 +00:00
preferences.c	Use null check convention in preferences.c	2015-05-04 22:33:19 +01:00
preferences.h	Added option to show jids in occupants panel	2015-04-12 02:14:37 +01:00
theme.c	Use null check convention in theme.c	2015-05-04 22:33:55 +01:00
theme.h	Added receipt.sent theme setting	2015-03-15 19:35:25 +00:00