aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-08-15 08:36:59 +0200
committerJoakim Verona2013-08-15 08:36:59 +0200
commit6c21e9fe3cf487045bdf660e5400e2b9a7d6555f (patch)
tree45a6d4a9e3bf5e1b895c4e673f70cd8c37629a50 /admin/ChangeLog
parent31800c9173af4d2c445bb52b2c338a3f0bde5b12 (diff)
parent4fa4485689619ad0092e3fd289534cfb320f56f3 (diff)
downloademacs-6c21e9fe3cf487045bdf660e5400e2b9a7d6555f.tar.gz
emacs-6c21e9fe3cf487045bdf660e5400e2b9a7d6555f.zip
merge from trunk
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 791dbbc5989..36454ccb314 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12013-08-15 Xue Fuqiao <xfq.free@gmail.com>
2
3 * notes/hydra: More information about Hydra.
4
12013-08-10 Xue Fuqiao <xfq.free@gmail.com> 52013-08-10 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * notes/hydra: New file. 7 * notes/hydra: New file.