diff options
| author | Paul Eggert | 2011-06-15 11:52:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:52:30 -0700 |
| commit | dfc926249a7d14f037a01acba7a69339661e5107 (patch) | |
| tree | 4c5eeba568589c013f3df53a779c2bd780cd0675 /ChangeLog | |
| parent | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (diff) | |
| parent | 8c9b210626493dd93f236d7fb312c4f6dba62892 (diff) | |
| download | emacs-dfc926249a7d14f037a01acba7a69339661e5107.tar.gz emacs-dfc926249a7d14f037a01acba7a69339661e5107.zip | |
Merge from trunk.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-06-15 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib. | ||
| 4 | |||
| 1 | 2011-06-14 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2011-06-14 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3. | 7 | * configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3. |