aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/AndroidManifest.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* initial smp supportiNPUTmice2014-11-101-0/+4
|
* use proper theme for MTMiNPUTmice2014-11-091-4/+8
|
* Convert about dialog to activitySam Whited2014-11-041-23/+33
|
* fixed merge erroriNPUTmice2014-11-031-1/+0
|
* Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
|\ | | | | | | | | Conflicts: src/main/AndroidManifest.xml
| * 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