aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier2011-03-31 00:24:03 -0400
committerStefan Monnier2011-03-31 00:24:03 -0400
commit40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
treeb56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /etc/ChangeLog
parentf488fb6528738131ef41859e1f04125f2e50efce (diff)
parent44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
downloademacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz
emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.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 53cd307e3cc..b4a3d6d6ae7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12011-03-22 Sebastian Hermida <sebas00@gmail.com>
2
3 * themes/misterioso-theme.el: New file.
4
12011-03-16 Juanma Barranquero <lekktu@gmail.com> 52011-03-16 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * NEWS: Document warning about _emacs. 7 * NEWS: Document warning about _emacs.