aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJuanma Barranquero2014-04-02 17:14:50 +0200
committerJuanma Barranquero2014-04-02 17:14:50 +0200
commit09aba8153a8297e415477dbfa9a8c7e999fb3457 (patch)
tree1b15e57f5cb0d6fb4cec8e2ca03747d9e7abf163 /ChangeLog
parentaf1a69f4d17a482c359d98c00ef86fac835b5fac (diff)
parentffcd5669d6a71dd9450a9c45b2ea67d3ddc7c988 (diff)
downloademacs-09aba8153a8297e415477dbfa9a8c7e999fb3457.tar.gz
emacs-09aba8153a8297e415477dbfa9a8c7e999fb3457.zip
Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3572267857c..6612f178304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-04-02 Glenn Morris <rgm@gnu.org>
2
3 * configure.ac: Make the final "Does Emacs use Gsettings" message
4 consistent with src/config.h.
5
12014-03-31 Jan Djärv <jan.h.d@swipnet.se> 62014-03-31 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * configure.ac: Fix errors from previous checkin (GSettings check). 8 * configure.ac: Fix errors from previous checkin (GSettings check).