[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 02/02: Merge branch 'master' of git.sv.gnu.org:/srv
|
From: |
Michael Albinus |
|
Subject: |
[Emacs-diffs] master 02/02: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
|
Date: |
Sun, 23 Nov 2014 09:01:44 +0000 |
branch: master
commit 1b3e992e3945f19716f9088a26ce32807f07f301
Merge: 709a517 9c33811
Author: Michael Albinus <address@hidden>
Date: Sun Nov 23 10:01:18 2014 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
lisp/ChangeLog | 7 +++++++
lisp/calendar/cal-china.el | 29 ++++++++++++++++++++++-------
2 files changed, 29 insertions(+), 7 deletions(-)