summaryrefslogtreecommitdiffstats
path: root/tests/t-file-conflicts/Makefile (unfollow)
Commit message (Collapse)AuthorFilesLines
2024-08-07Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging debian version 1.22.11.Daniel Baumann1-0/+30
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging upstream version 1.22.11.Daniel Baumann138-907/+1458
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Releasing progress-linux version 1.22.10-0.0~progress7.99u1.progress-linux/1.22.10-0.0_progress7.99u1Daniel Baumann1-0/+17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging debian version 1.22.10.Daniel Baumann1-0/+18
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging upstream version 1.22.10.Daniel Baumann104-205/+426
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Releasing progress-linux version 1.22.9-0.0~progress7.99u1.progress-linux/1.22.9-0.0_progress7.99u1Daniel Baumann1-0/+17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging debian version 1.22.9.Daniel Baumann1-0/+16
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging upstream version 1.22.9.Daniel Baumann154-1329/+2590
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Releasing progress-linux version 1.22.8-0.0~progress7.99u1.progress-linux/1.22.8-0.0_progress7.99u1Daniel Baumann1-0/+17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging debian version 1.22.8.Daniel Baumann1-0/+25
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging upstream version 1.22.8.Daniel Baumann107-520/+870
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Releasing progress-linux version 1.22.7-0.0~progress7.99u1.progress-linux/1.22.7-0.0_progress7.99u1Daniel Baumann1-0/+17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging debian version 1.22.7.Daniel Baumann6-7/+192
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-08-07Merging upstream version 1.22.7.Daniel Baumann568-14508/+28673
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Releasing progress-linux version 1.22.6-0.0~progress7.99u1.progress-linux/1.22.6-0.0_progress7.99u1Daniel Baumann1-0/+17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Merging debian version 1.22.6.Daniel Baumann1-1/+43
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Merging upstream version 1.22.6.Daniel Baumann180-2458/+2916
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Releasing progress-linux version 1.22.5-0.0~progress7.99u1.progress-linux/1.22.5-0.0_progress7.99u1Daniel Baumann1-0/+18
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Regenerating debian files.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Refreshing overlayfs.patch.Daniel Baumann1-2/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Merging debian version 1.22.5.Daniel Baumann2-6/+67
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Merging upstream version 1.22.5.Daniel Baumann188-2776/+5110
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Releasing progress-linux version 1.22.4-0.0~progress7.99u1.progress-linux/1.22.4-0.0_progress7.99u1Daniel Baumann1-0/+15
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Regenerating debian files.Daniel Baumann2-0/+10
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Disabling warning about unsupported system (Closes: #994388).Daniel Baumann1-1/+0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Adding patch from Raphaël Hertzog <hertzog@debian.org> to fallback on ↵Daniel Baumann2-0/+36
/bin/mv when rename syscall fails with EXDEV (Closes: #836211). Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Updating source format.Daniel Baumann1-1/+1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Updating vcs fields.Daniel Baumann1-2/+4
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Updating bugs field.Daniel Baumann1-0/+1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Updating uploaders field.Daniel Baumann1-1/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Updating maintainer field.Daniel Baumann1-1/+2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Adding debian version 1.22.4.debian/1.22.4Daniel Baumann40-0/+17322
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
2024-04-15Adding upstream version 1.22.4.upstream/1.22.4Daniel Baumann2094-0/+1339736
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>