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 |
|
Rene Treffer
|
20eb770356
|
Switch to maven central minidns
|
2015-01-14 22:43:43 +01:00 |
|
|
|
71bb1e90b0
|
changes to get it working under eclipse
|
2015-01-10 23:11:07 +01:00 |
|
Michael
|
868d9f890c
|
update android gradle plugin to 0.14.4
to work with AS >= 0.9.0 plugin >= 0.14.0 is required
also update gradle to 2.2.
|
2014-11-22 19:53:37 +01:00 |
|
Sam Whited
|
4a1bae3a69
|
Subtree merged in minidns
|
2014-10-28 12:14:21 -04:00 |
|
Sam Whited
|
ccba01ef19
|
Remove minidns dir
|
2014-10-28 12:13:53 -04:00 |
|
Sam Whited
|
a6d0042e5c
|
Move submodules back to libs/
|
2014-10-26 09:54:41 -04:00 |
|
