summaryrefslogtreecommitdiffstats
path: root/merge.cc (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merging upstream version 1.19.Daniel Baumann2017-05-071-27/+131
| | | | Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
* Merging upstream version 1.18.Daniel Baumann2016-05-201-77/+89
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.18~pre1.Daniel Baumann2015-11-071-2/+2
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.17~rc2.Daniel Baumann2015-11-071-1/+1
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.17~rc1.Daniel Baumann2015-11-071-1/+4
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.17~pre1.Daniel Baumann2015-11-071-52/+148
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.16.Daniel Baumann2015-11-071-2/+2
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.16~rc1.Daniel Baumann2015-11-071-1/+1
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.16~pre2.Daniel Baumann2015-11-071-25/+20
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.16~pre1.Daniel Baumann2015-11-071-28/+7
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.15~rc1.Daniel Baumann2015-11-071-1/+1
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.15~pre1.Daniel Baumann2015-11-071-167/+211
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.14~rc3.Daniel Baumann2015-11-071-2/+2
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.14~rc1.Daniel Baumann2015-11-071-37/+40
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.13.Daniel Baumann2015-11-071-6/+7
| | | | Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
* Merging upstream version 1.13~rc2.Daniel 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>