aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 989ecce9d2a..eed82fc865b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12011-05-20 Paul Eggert <eggert@cs.ucla.edu>
2
3 * systime.h (Time): Define only if emacs is defined.
4 This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
5 where the include path doesn't have X11/X.h by default. See
6 <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
7
12011-05-20 Kenichi Handa <handa@m17n.org> 82011-05-20 Kenichi Handa <handa@m17n.org>
2 9
3 * composite.c (find_automatic_composition): Fix previous change. 10 * composite.c (find_automatic_composition): Fix previous change.