| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge master-origin | steckbrief | 2015-02-20 | 23 | -2948/+0 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Switch to maven central minidns | Rene Treffer | 2015-01-14 | 23 | -2948/+0 |
| | | | |||||
| * | | changes to get it working under eclipse | lookshe | 2015-01-10 | 3 | -0/+30 |
| |/ | |||||
| * | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 1 | -2/+5 |
| | | | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2. | ||||
| * | Subtree merged in minidns | Sam Whited | 2014-10-28 | 23 | -0/+2945 |
| | | |||||
| * | Remove minidns dir | Sam Whited | 2014-10-28 | 1 | -6/+0 |
| | | |||||
| * | Move submodules back to libs/ | Sam Whited | 2014-10-26 | 1 | -0/+6 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |