aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
|
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-012-7/+7
|
* Merge branch 'gradle' into developmentSam Whited2014-10-3041-376/+846
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-22313-0/+25560