cheogram/src/eu/siacs/conversations/ui
iNPUTmice c02ef80086 Merge branch 'master' of github.com:siacs/Conversations
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
2014-09-09 14:16:51 +02:00
..
adapter setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
ChooseContactActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
ConferenceDetailsActivity.java
ContactDetailsActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
ConversationActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
ConversationFragment.java simplefied some code that might have been the source for some strange bugs 2014-09-08 20:29:57 +02:00
EditAccountActivity.java
EditMessage.java
ManageAccountActivity.java
PublishProfilePictureActivity.java
SettingsActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
SettingsFragment.java
ShareWithActivity.java Merge branch 'master' of github.com:siacs/Conversations 2014-09-09 14:16:51 +02:00
StartConversationActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00
UiCallback.java
XmppActivity.java setting to increase font size. fixed #420 2014-09-08 23:58:37 +02:00