aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed merge errornfciNPUTmice2014-11-031-1/+0
* Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
|\
| * basic beam code / untestediNPUTmice2014-11-031-22/+20
* | use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
* | basic beam code / untestediNPUTmice2014-11-031-22/+20
|/
* Make conversations the root projectSam Whited2014-10-221-0/+118