summaryrefslogtreecommitdiffstats
path: root/merge.cc (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 1.15~pre1.Daniel Baumann2015-11-071-167/+211
* Merging upstream version 1.14~rc3.Daniel Baumann2015-11-071-2/+2
* Merging upstream version 1.14~rc1.Daniel Baumann2015-11-071-37/+40
* Merging upstream version 1.13.Daniel Baumann2015-11-071-6/+7
* Merging upstream version 1.13~rc2.Daniel Baumann2015-11-071-22/+3
* Adding upstream version 1.13~rc1.upstream/1.13_rc1Daniel Baumann2015-11-071-0/+406