Mercurial > emacs
comparison lisp/battery.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; battery.el --- display battery status information -*- coding: iso-8859-1 -*- | 1 ;;; battery.el --- display battery status information -*- coding: iso-8859-1 -*- |
2 | 2 |
3 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, | 3 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, |
4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> | 6 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org> |
7 ;; Keywords: hardware | 7 ;; Keywords: hardware |
8 | 8 |
9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |