aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-09-16 08:27:23 +0200
committerJoakim Verona2013-09-16 08:27:23 +0200
commitdf15e4f6391d475acf15dcb512a28eed9964caac (patch)
treea1b8b76d585bb6168da097b4ce1b35be3fe8b1e6 /etc/ChangeLog
parent2b483f0f59ff7f125dfbe490e42eb84c238ac971 (diff)
parent578c21bc0316661f211dd73a9eb65c8213bd372f (diff)
downloademacs-df15e4f6391d475acf15dcb512a28eed9964caac.tar.gz
emacs-df15e4f6391d475acf15dcb512a28eed9964caac.zip
merge from trunk
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index bd5534d9446..5483d824da4 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12013-09-15 Jan Djärv <jan.h.d@swipnet.se>
2
3 * NEWS: Mention the macfont backend.
4
12013-09-09 Glenn Morris <rgm@gnu.org> 52013-09-09 Glenn Morris <rgm@gnu.org>
2 6
3 * refcards/Makefile (PS_ENGLISH, PS_CZECH, PS_FRENCH, PS_GERMAN) 7 * refcards/Makefile (PS_ENGLISH, PS_CZECH, PS_FRENCH, PS_GERMAN)