aboutsummaryrefslogtreecommitdiffstats
path: root/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 /ChangeLog
parent2b483f0f59ff7f125dfbe490e42eb84c238ac971 (diff)
parent578c21bc0316661f211dd73a9eb65c8213bd372f (diff)
downloademacs-df15e4f6391d475acf15dcb512a28eed9964caac.tar.gz
emacs-df15e4f6391d475acf15dcb512a28eed9964caac.zip
merge from trunk
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fc4e065e92..c034a293004 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-09-15 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.ac: Add check for OSX 10.5, required for macfont.o.
4
12013-09-09 Glenn Morris <rgm@gnu.org> 52013-09-09 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.ac (LDFLAGS_NOCOMBRELOC): New variable. 7 * configure.ac (LDFLAGS_NOCOMBRELOC): New variable.