summaryrefslogtreecommitdiff
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-04-20 16:48:50 +0800
committerChong Yidong <cyd@gnu.org>2012-04-20 16:48:50 +0800
commitc07a4c0b599e0debfb10acdf02ac6559b998a88a (patch)
treef87bca47c21f04b43cca2347a21ed89c57b67958 /etc/ChangeLog
parent6cf2a23e297b8a57a70c2a1dab5aa28b73461b0b (diff)
parent50e5ebca7edcf5299b89ff74499991de01e22046 (diff)
downloademacs-c07a4c0b599e0debfb10acdf02ac6559b998a88a.tar.gz
Merge from emacs-24 branch
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9353b617cb2..f2cdfb83c44 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-20 Glenn Morris <rgm@gnu.org>
+
+ * CONTRIBUTE: Expand a bit on copyright assignments.
+
+ * MORE.STUFF: General update. Mention list-packages.
+ Remove many old/outdated URLs.
2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* publicsuffix.txt: New file (bug#1401).