archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
conversations/libs/minidns
History
steckbrief 20eae39557 Merge master-origin 
Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml
2015-02-20 22:19:31 +01:00
..
AndroidManifest.xml changes to get it working under eclipse 2015-01-10 23:11:07 +01:00
lint.xml changes to get it working under eclipse 2015-01-10 23:11:07 +01:00
project.properties changes to get it working under eclipse 2015-01-10 23:11:07 +01:00