diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-11-19 16:45:53 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-11-19 16:45:53 -0500 |
| commit | 71c4ee9f5220f3e683da583f8a4657b9ebb741ee (patch) | |
| tree | 5e071e58b84f11006d8345592a3a4dce8a6ba330 /becommands/merge.py | |
| parent | 8a2c80bbaa02fd29ac192135f1ec095b0a048e20 (diff) | |
| parent | 4c6a1e6439293c7e584aef4fda0da1a3968fe7c9 (diff) | |
| download | bugseverywhere-71c4ee9f5220f3e683da583f8a4657b9ebb741ee.tar.gz | |
Merged updated READMEs and new update_copyright.py (and its results).
Diffstat (limited to 'becommands/merge.py')
| -rw-r--r-- | becommands/merge.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/becommands/merge.py b/becommands/merge.py index f212b01..bc18479 100644 --- a/becommands/merge.py +++ b/becommands/merge.py @@ -1,4 +1,5 @@ -# Copyright (C) 2008-2009 W. Trevor King <wking@drexel.edu> +# Copyright (C) 2008-2009 Gianluca Montecchi <gian@grys.it> +# W. Trevor King <wking@drexel.edu> # # 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 |