aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* added missing return statement. fixed api bugiNPUTmice2014-11-041-3/+2
* be more OOM. Dietrich2014-11-041-51/+44
* support pre JELLY_BEAN ndefM. Dietrich2014-11-041-16/+24
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-033-165/+271
|\
| * basic beam code / untestediNPUTmice2014-11-033-127/+187
* | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-032-11/+110
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-3013-103/+199
* Make conversations the root projectSam Whited2014-10-2220-0/+6024