aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/copyright
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /admin/notes/copyright
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'admin/notes/copyright')
-rw-r--r--admin/notes/copyright2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 173ff83343a..3a404b69678 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
1Copyright (C) 2007-2012 Free Software Foundation, Inc. 1Copyright (C) 2007-2013 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4