summaryrefslogtreecommitdiffstats
path: root/merge.cc (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-11-07Adding debian version 1.13-1.debian/1.13-1Daniel Baumann4-6/+20
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2015-11-07Merging upstream version 1.13.Daniel Baumann21-284/+722
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2015-11-07Adding debian version 1.13~rc2-1.debian/1.13_rc2-1Daniel Baumann1-0/+6
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2015-11-07Merging upstream version 1.13~rc2.Daniel Baumann17-129/+676
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2015-11-07Adding debian version 1.13~rc1-1.debian/1.13_rc1-1Daniel Baumann8-0/+114
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
2015-11-07Adding upstream version 1.13~rc1.upstream/1.13_rc1Daniel Baumann29-0/+5332
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>