aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJan Djärv2012-10-13 23:52:09 +0200
committerJan Djärv2012-10-13 23:52:09 +0200
commit537f336d6228aa48d36c7749aff348569da0ab61 (patch)
tree1f3fb05c7cc22e0f007317ecdab951d5072b2b93 /src/ChangeLog
parent3071811230cf9f6cd461a34cc7202565c4f9947a (diff)
downloademacs-537f336d6228aa48d36c7749aff348569da0ab61.tar.gz
emacs-537f336d6228aa48d36c7749aff348569da0ab61.zip
* gtkutil.c (xg_set_widget_bg): Divide by 65535.
Fixes: debbugs:12612
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 56131aca4b2..6bb34d9866a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-10-13 Jan Djärv <jan.h.d@swipnet.se>
2
3 * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).
4
12012-10-13 HANATAKA, Shinya <bogytech@gmail.com> (tiny change) 52012-10-13 HANATAKA, Shinya <bogytech@gmail.com> (tiny change)
2 6
3 * coding.c (detect_coding): Set coding->id before calling 7 * coding.c (detect_coding): Set coding->id before calling
@@ -1290,6 +1294,7 @@
1290 * sysdep.c (init_signals): Do not use SA_NODEFER. It wasn't 1294 * sysdep.c (init_signals): Do not use SA_NODEFER. It wasn't
1291 wanted even on POSIXish hosts, and it doesn't work on Windows. 1295 wanted even on POSIXish hosts, and it doesn't work on Windows.
1292 1296
1297>>>>>>> MERGE-SOURCE
12932012-09-23 Jan Djärv <jan.h.d@swipnet.se> 12982012-09-23 Jan Djärv <jan.h.d@swipnet.se>
1294 1299
1295 * xterm.c (x_term_init): Call fixup_locale before and after calling 1300 * xterm.c (x_term_init): Call fixup_locale before and after calling