aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xml/XmlReader.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-11/+2
|\
| * catch all exceptions thrown by xml pull parserDaniel Gultsch2016-05-071-11/+2
* | Imports organizedsteckbrief2016-02-121-5/+0
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-0/+4
|\|
| * Optimize importsAndreas Straub2015-07-201-8/+8
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-5/+6
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-2/+2
|\| | | |/ |/|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-141/+0
|/
* Make conversations the root projectSam Whited2014-10-221-0/+141