aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2011-07-28 11:45:07 -0400
committerChong Yidong2011-07-28 11:45:07 -0400
commitc897048c52b767decd44fa59805f80cd71ae9050 (patch)
tree0d89dd4b12386325ccbeb33e5fb4267711da6ce3 /src/ChangeLog
parentea180610badb3df580d68e444f4418dce7929d17 (diff)
downloademacs-c897048c52b767decd44fa59805f80cd71ae9050.tar.gz
emacs-c897048c52b767decd44fa59805f80cd71ae9050.zip
Backport 2010-07-03T14:42:02Z!eliz@gnu.org from trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0587a414acb..1c2218f9d96 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-07-28 Eli Zaretskii <eliz@gnu.org>
2
3 * xfaces.c (update_face_from_frame_parameter): Move out of
4 HAVE_WINDOW_SYSTEM portion. Condition window-system only parts
5 with HAVE_WINDOW_SYSTEM.
6
12011-07-26 Andreas Schwab <schwab@linux-m68k.org> 72011-07-26 Andreas Schwab <schwab@linux-m68k.org>
2 8
3 * fontset.c (fontset_get_font_group): Add proper type checks. 9 * fontset.c (fontset_get_font_group): Add proper type checks.