diff options
| author | Joakim Verona | 2013-08-26 19:42:14 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-26 19:42:14 +0200 |
| commit | c635a4f3d114db265e574f106710f497b2a450b6 (patch) | |
| tree | 5689d824ba11b6846fc40e2f99ec3a53daa42ef2 /src/ChangeLog | |
| parent | 789fc3346ed7f2e8a2c3ba09502bce59893f1167 (diff) | |
| parent | f5adc984fbdc82def6edc297e88c3ee993c674ae (diff) | |
| download | emacs-c635a4f3d114db265e574f106710f497b2a450b6.tar.gz emacs-c635a4f3d114db265e574f106710f497b2a450b6.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37d3419532b..324fa156f68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-26 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * frame.c (check_minibuf_window): Initialize 'window' properly, | ||
| 4 | so that Emacs reliably aborts later if 'window' is not initialized. | ||
| 5 | |||
| 1 | 2013-08-26 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2013-08-26 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead | 8 | * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead |