summaryrefslogtreecommitdiffstats
path: root/merge.cc (unfollow)
Commit message (Expand)AuthorFilesLines
2017-05-07Adding upstream version 1.19.upstream/1.19Daniel Baumann1-27/+131
2016-05-20Adding upstream version 1.18.upstream/1.18Daniel Baumann45-774/+1576
2015-11-07Adding upstream version 1.18~pre2.upstream/1.18_pre2Daniel Baumann18-220/+427
2015-11-07Adding upstream version 1.18~pre1.upstream/1.18_pre1Daniel Baumann17-199/+451
2015-11-07Adding upstream version 1.17.upstream/1.17Daniel Baumann13-93/+71
2015-11-07Adding upstream version 1.17~rc2.upstream/1.17_rc2Daniel Baumann12-98/+124
2015-11-07Adding upstream version 1.17~rc1.upstream/1.17_rc1Daniel Baumann27-241/+625
2015-11-07Adding upstream version 1.17~pre1.upstream/1.17_pre1Daniel Baumann17-186/+419
2015-11-07Adding upstream version 1.16.upstream/1.16Daniel Baumann23-96/+113
2015-11-07Adding upstream version 1.16~rc1.upstream/1.16_rc1Daniel Baumann33-1307/+966
2015-11-07Adding upstream version 1.16~pre2.upstream/1.16_pre2Daniel Baumann19-143/+685
2015-11-07Adding upstream version 1.16~pre1.upstream/1.16_pre1Daniel Baumann23-446/+520
2015-11-07Adding upstream version 1.15.upstream/1.15Daniel Baumann10-49/+45
2015-11-07Adding upstream version 1.15~rc1.upstream/1.15_rc1Daniel Baumann20-220/+440
2015-11-07Adding upstream version 1.15~pre1.upstream/1.15_pre1Daniel Baumann36-487/+785
2015-11-07Adding upstream version 1.14.upstream/1.14Daniel Baumann9-55/+78
2015-11-07Adding upstream version 1.14~rc3.upstream/1.14_rc3Daniel Baumann17-74/+152
2015-11-07Adding upstream version 1.14~rc2.upstream/1.14_rc2Daniel Baumann11-127/+141
2015-11-07Adding upstream version 1.14~rc1.upstream/1.14_rc1Daniel Baumann23-660/+817
2015-11-07Adding upstream version 1.13.upstream/1.13Daniel Baumann21-284/+722
2015-11-07Adding upstream version 1.13~rc2.upstream/1.13_rc2Daniel Baumann17-129/+676
2015-11-07Adding upstream version 1.13~rc1.upstream/1.13_rc1Daniel Baumann29-0/+5332