| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merged 1.5.2 into trz/master with conflicts resolved | steckbrief | 2015-08-11 | 2 | -2/+2 |
| |\ | |||||
| | * | really update build tools | Daniel Gultsch | 2015-06-02 | 2 | -2/+2 |
| * | | moved color picker to libs | lookshe | 2015-04-15 | 34 | -0/+852 |
| * | | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1018 | -0/+4064 |
| * | | Merge master-origin | steckbrief | 2015-02-20 | 23 | -2948/+0 |
| |\| | |||||
| | * | Switch to maven central minidns | Rene Treffer | 2015-01-14 | 23 | -2948/+0 |
| * | | changes to get it working under eclipse | lookshe | 2015-01-10 | 9 | -0/+30 |
| |/ | |||||
| * | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 1 | -2/+5 |
| * | Subtree merged in openpgp api lib | Sam Whited | 2014-10-28 | 45 | -6/+1829 |
| * | Subtree merged in minidns | Sam Whited | 2014-10-28 | 23 | -0/+2945 |
| * | Remove minidns dir | Sam Whited | 2014-10-28 | 1 | -6/+0 |
| * | Subtree merged in MemorizingTrustManager | Sam Whited | 2014-10-28 | 35 | -0/+1875 |
| * | Move submodules back to libs/ | Sam Whited | 2014-10-26 | 3 | -0/+12 |
| * | Pull otr4j form Maven repo | Sam Whited | 2014-10-26 | 1 | -0/+0 |
| * | Suppress lint errors and remove bcprov | Sam Whited | 2014-10-22 | 1 | -0/+0 |
| * | Add build deps and move build props to build file | Sam Whited | 2014-10-22 | 2 | -0/+0 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |