diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
| commit | 7c420169baa7c50428589cca7f8eda71b462eb15 (patch) | |
| tree | b556f9e181818bbaf8b5b425844b4ae26e88f537 /lisp/version.el | |
| parent | bb7f5cbcda931661c8dc3311603ac764fa87a639 (diff) | |
| parent | d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff) | |
| download | emacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/version.el')
| -rw-r--r-- | lisp/version.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/version.el b/lisp/version.el index b4e2c61b570..f1146e8a510 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -88,5 +88,4 @@ to the system configuration; look at `system-configuration' instead." ;;version-control: never ;;End: -;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0 ;;; version.el ends here |