diff options
Diffstat (limited to 'tests.merging')
| -rwxr-xr-x | tests.merging/basic.script | 2 | ||||
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 2 | ||||
| -rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 2 | ||||
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 2 | ||||
| -rwxr-xr-x | tests.merging/rename-chunk.script | 2 | ||||
| -rwxr-xr-x | tests.merging/rename-stratum.script | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 4c174526..6d01ba16 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index d5ed0507..5a0c5f52 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index 00bc551a..c96c59ab 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index 6aabf303..3a00015b 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script index a866f8a9..8c323798 100755 --- a/tests.merging/rename-chunk.script +++ b/tests.merging/rename-chunk.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script index 94bdb639..ba759fa3 100755 --- a/tests.merging/rename-stratum.script +++ b/tests.merging/rename-stratum.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |