iNPUTmice 409fdd8596 Merge branch 'development' of github.com:siacs/Conversations into development		2014-09-07 23:08:57 +02:00
..
crypto	deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.	2014-09-07 15:58:59 +02:00
entities	fixed #321 - delete otr fingerprints	2014-09-07 23:08:40 +02:00
generator	some code cleanup	2014-08-31 16:28:21 +02:00
parser	MUC: set the password from bookmarks.	2014-09-07 14:06:23 +02:00
persistance	rotate avatars	2014-09-02 11:19:05 +02:00
services	MUC: set the password from bookmarks.	2014-09-07 14:06:23 +02:00
ui	Merge branch 'development' of github.com:siacs/Conversations into development	2014-09-07 23:08:57 +02:00
utils	trying to avoid rejectedexection	2014-09-07 15:11:40 +02:00
xml	fixed #403	2014-09-01 13:51:49 +02:00
xmpp	avoiding resource conflicts	2014-09-03 14:57:40 +02:00
Config.java	made emoticon parsing enableable - default false	2014-09-03 09:15:07 +02:00