aboutsummaryrefslogtreecommitdiffstats
path: root/msdos/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /msdos/ChangeLog
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 'msdos/ChangeLog')
-rw-r--r--msdos/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index c530dff150c..6575282689c 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1485,7 +1485,7 @@
1485;; coding: utf-8 1485;; coding: utf-8
1486;; End: 1486;; End:
1487 1487
1488 Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc. 1488 Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
1489 1489
1490 This file is part of GNU Emacs. 1490 This file is part of GNU Emacs.
1491 1491