summaryrefslogtreecommitdiffstats
path: root/merge.cc (unfollow)
Commit message (Expand)AuthorFilesLines
2016-05-20Merging upstream version 1.18.Daniel Baumann45-774/+1576
2015-11-07Adding debian version 1.18~pre2-1.debian/1.18_pre2-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.18~pre2.Daniel Baumann18-220/+427
2015-11-07Adding debian version 1.18~pre1-1.debian/1.18_pre1-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.18~pre1.Daniel Baumann17-199/+451
2015-11-07Adding debian version 1.17-1.debian/1.17-1Daniel Baumann2-1/+7
2015-11-07Merging upstream version 1.17.Daniel Baumann13-93/+71
2015-11-07Adding debian version 1.17~rc2-1.debian/1.17_rc2-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.17~rc2.Daniel Baumann12-98/+124
2015-11-07Adding debian version 1.17~rc1-1.debian/1.17_rc1-1Daniel Baumann2-3/+10
2015-11-07Merging upstream version 1.17~rc1.Daniel Baumann27-241/+625
2015-11-07Adding debian version 1.17~pre1-1.debian/1.17_pre1-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.17~pre1.Daniel Baumann17-186/+419
2015-11-07Adding debian version 1.16-2.debian/1.16-2debian-jessieDaniel Baumann5-11/+21
2015-11-07Adding debian version 1.16-1.debian/1.16-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.16.Daniel Baumann23-96/+113
2015-11-07Adding debian version 1.16~rc1-1.debian/1.16_rc1-1Daniel Baumann2-9/+17
2015-11-07Merging upstream version 1.16~rc1.Daniel Baumann33-1307/+966
2015-11-07Adding debian version 1.16~pre2-1.debian/1.16_pre2-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.16~pre2.Daniel Baumann19-143/+685
2015-11-07Adding debian version 1.16~pre1-1.debian/1.16_pre1-1Daniel Baumann2-2/+9
2015-11-07Merging upstream version 1.16~pre1.Daniel Baumann23-446/+520
2015-11-07Adding debian version 1.15-2.debian/1.15-2Daniel Baumann4-3/+11
2015-11-07Adding debian version 1.15-1.debian/1.15-1Daniel Baumann2-2/+8
2015-11-07Merging upstream version 1.15.Daniel Baumann10-49/+45
2015-11-07Adding debian version 1.15~rc1-1.debian/1.15_rc1-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.15~rc1.Daniel Baumann20-220/+440
2015-11-07Adding debian version 1.15~pre1-2.debian/1.15_pre1-2Daniel Baumann2-3/+18
2015-11-07Adding debian version 1.15~pre1-1.debian/1.15_pre1-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.15~pre1.Daniel Baumann36-487/+785
2015-11-07Adding debian version 1.14-1.debian/1.14-1Daniel Baumann2-2/+9
2015-11-07Merging upstream version 1.14.Daniel Baumann9-55/+78
2015-11-07Adding debian version 1.14~rc3-2.debian/1.14_rc3-2Daniel Baumann2-0/+7
2015-11-07Adding debian version 1.14~rc3-1.debian/1.14_rc3-1Daniel Baumann2-4/+12
2015-11-07Merging upstream version 1.14~rc3.Daniel Baumann17-74/+152
2015-11-07Adding debian version 1.14~rc2-1.debian/1.14_rc2-1Daniel Baumann3-25/+7
2015-11-07Merging upstream version 1.14~rc2.Daniel Baumann11-127/+141
2015-11-07Adding debian version 1.14~rc1-1.debian/1.14_rc1-1Daniel Baumann10-13/+106
2015-11-07Merging upstream version 1.14~rc1.Daniel Baumann23-660/+817
2015-11-07Adding debian version 1.13-4.debian/1.13-4Daniel Baumann4-8/+14
2015-11-07Adding debian version 1.13-3.debian/1.13-3Daniel Baumann2-1/+8
2015-11-07Adding debian version 1.13-2.debian/1.13-2debian-wheezyDaniel Baumann6-4/+33
2015-11-07Adding debian version 1.13-1.debian/1.13-1Daniel Baumann4-6/+20
2015-11-07Merging upstream version 1.13.Daniel Baumann21-284/+722
2015-11-07Adding debian version 1.13~rc2-1.debian/1.13_rc2-1Daniel Baumann1-0/+6
2015-11-07Merging upstream version 1.13~rc2.Daniel Baumann17-129/+676
2015-11-07Adding debian version 1.13~rc1-1.debian/1.13_rc1-1Daniel Baumann8-0/+114
2015-11-07Adding upstream version 1.13~rc1.upstream/1.13_rc1Daniel Baumann29-0/+5332