summaryrefslogtreecommitdiffstats
path: root/merge.cc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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>