diff options
| author | Glenn Morris | 2012-01-10 00:32:46 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-01-10 00:32:46 -0800 |
| commit | 959272ecf045739c52dcf65b1b5a4e591de9e920 (patch) | |
| tree | 66605075bed67cd46c63b2271e2c2a6ca7e184b8 /lisp | |
| parent | ed516deec46c8e45356c066b79c3f77ca8cdb4d0 (diff) | |
| download | emacs-959272ecf045739c52dcf65b1b5a4e591de9e920.tar.gz emacs-959272ecf045739c52dcf65b1b5a4e591de9e920.zip | |
Update short copyright year to 2012 (do not merge to trunk)
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex:
* etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex:
* etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex:
* etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex:
* lib-src/ebrowse.c (version) <emacs_copyright>:
* lib-src/etags.c (print_version) <emacs_copyright>:
* lib-src/rcs2log (Copyright):
* lisp/version.el (emacs-copyright):
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
Update short copyright year to 2012.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/version.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f579b7179d4..6b96ed60dd0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-01-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * version.el (emacs-copyright): Update year to 2012. | ||
| 4 | |||
| 1 | 2011-08-21 Deniz Dogan <deniz@dogan.se> | 5 | 2011-08-21 Deniz Dogan <deniz@dogan.se> |
| 2 | 6 | ||
| 3 | * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of | 7 | * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of |
diff --git a/lisp/version.el b/lisp/version.el index 424c681c083..14b447eda2e 100644 --- a/lisp/version.el +++ b/lisp/version.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- | 1 | ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, | 3 | ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, |
| 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
| 5 | ;; Free Software Foundation, Inc. | 5 | ;; Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | ;;; Code: | 30 | ;;; Code: |
| 31 | 31 | ||
| 32 | (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ | 32 | (defconst emacs-copyright "Copyright (C) 2012 Free Software Foundation, Inc." "\ |
| 33 | Short copyright string for this version of Emacs.") | 33 | Short copyright string for this version of Emacs.") |
| 34 | 34 | ||
| 35 | (defconst emacs-version "23.3.50" "\ | 35 | (defconst emacs-version "23.3.50" "\ |