aboutsummaryrefslogtreecommitdiffstats
path: root/libs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-112-2/+2
|\
| * really update build toolsDaniel Gultsch2015-06-022-2/+2
* | moved color picker to libslookshe2015-04-1534-0/+852
* | whatsapp-like smiley implementationlookshe2015-04-121018-0/+4064
* | Merge master-originsteckbrief2015-02-2023-2948/+0
|\|
| * Switch to maven central minidnsRene Treffer2015-01-1423-2948/+0
* | changes to get it working under eclipselookshe2015-01-109-0/+30
|/
* update android gradle plugin to 0.14.4Michael2014-11-221-2/+5
* Subtree merged in openpgp api libSam Whited2014-10-2845-6/+1829
* Subtree merged in minidnsSam Whited2014-10-2823-0/+2945
* Remove minidns dirSam Whited2014-10-281-6/+0
* Subtree merged in MemorizingTrustManagerSam Whited2014-10-2835-0/+1875
* Move submodules back to libs/Sam Whited2014-10-263-0/+12
* Pull otr4j form Maven repoSam Whited2014-10-261-0/+0
* Suppress lint errors and remove bcprovSam Whited2014-10-221-0/+0
* Add build deps and move build props to build fileSam Whited2014-10-222-0/+0