diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-03 17:47:34 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-03 17:47:34 +0000 |
| commit | 7172dca14d7306d79e93b97dcef3a006309f2e03 (patch) | |
| tree | 08678cc13b518a0a3cbdc4e059c52e1de0a9757a /morphlib/plugins | |
| parent | 530ffb7125f87e528dcf6338b637ef71a7930b8c (diff) | |
| parent | ee1cb9b7e6366568a29016f09adbdb327073e470 (diff) | |
| download | morph-7172dca14d7306d79e93b97dcef3a006309f2e03.tar.gz | |
Merge remote-tracking branch 'origin/jonathanmaw/ccache-local-fix'
Fixed a copyright year to make ./check happy.
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 30f66ff1..88c017c8 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1,4 +1,4 @@ -# 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 |