comparison lisp/calendar/cal-china.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 280c8ae2476d 376148b31b5e
children ef719132ddfa
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; cal-china.el --- calendar functions for the Chinese calendar 1 ;;; cal-china.el --- calendar functions for the Chinese calendar
2 2
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. 4 ;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> 6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> 7 ;; Maintainer: Glenn Morris <rgm@gnu.org>
8 ;; Keywords: calendar 8 ;; Keywords: calendar
9 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary 9 ;; Human-Keywords: Chinese calendar, calendar, holidays, diary