diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /autogen | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'autogen')
| -rwxr-xr-x | autogen/configure | 2 | ||||
| -rwxr-xr-x | autogen/update_autogen | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/autogen/configure b/autogen/configure index a37c2af83e5..4db2595c851 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -16102,7 +16102,7 @@ fi | |||
| 16102 | 16102 | ||
| 16103 | version=$PACKAGE_VERSION | 16103 | version=$PACKAGE_VERSION |
| 16104 | 16104 | ||
| 16105 | copyright="Copyright (C) 2012 Free Software Foundation, Inc." | 16105 | copyright="Copyright (C) 2013 Free Software Foundation, Inc." |
| 16106 | 16106 | ||
| 16107 | cat >>confdefs.h <<_ACEOF | 16107 | cat >>confdefs.h <<_ACEOF |
| 16108 | #define COPYRIGHT "$copyright" | 16108 | #define COPYRIGHT "$copyright" |
diff --git a/autogen/update_autogen b/autogen/update_autogen index 14a4119087e..264d8d83d6d 100755 --- a/autogen/update_autogen +++ b/autogen/update_autogen | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | ### update_autogen - update the generated files in Emacs autogen/ directory | 2 | ### update_autogen - update the generated files in Emacs autogen/ directory |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2011-2012 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2011-2013 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | 7 | ||