summaryrefslogtreecommitdiffstats
path: root/merge.cc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 1.15~pre1.upstream/1.15_pre1Daniel Baumann2015-11-071-167/+211
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Adding upstream version 1.14~rc3.upstream/1.14_rc3Daniel Baumann2015-11-071-2/+2
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Adding upstream version 1.14~rc1.upstream/1.14_rc1Daniel Baumann2015-11-071-37/+40
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Adding upstream version 1.13.upstream/1.13Daniel Baumann2015-11-071-6/+7
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Adding upstream version 1.13~rc2.upstream/1.13_rc2Daniel Baumann2015-11-071-22/+3
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Adding upstream version 1.13~rc1.upstream/1.13_rc1Daniel Baumann2015-11-071-0/+406
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>