aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-13/+2
|\ | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-108/+0
|/ | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* support for XEP-0092: Software VersioniNPUTmice2015-02-161-0/+14
|
* avoiding concurrent modificationiNPUTmice2014-12-131-4/+1
|
* close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
|
* Make conversations the root projectSam Whited2014-10-221-0/+95