summaryrefslogtreecommitdiff
path: root/lisp/battery.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-01-02 08:13:04 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/battery.el
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/battery.el')
-rw-r--r--lisp/battery.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/battery.el b/lisp/battery.el
index 79d86c11ac2..98ba7d1b631 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,6 +1,6 @@
;;; battery.el --- display battery status information -*- coding: iso-8859-1 -*-
-;; Copyright (C) 1997-1998, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc.
;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
;; Keywords: hardware