diff options
| author | Paul Eggert | 2011-06-15 11:07:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 11:07:38 -0700 |
| commit | ff672d2c8785de6faba84a400fb8153e9fa07cd2 (patch) | |
| tree | 4c5dc68b7a92e54c86e47f3bd9a804c14be57091 /ChangeLog | |
| parent | e69dafade3ccd5c2997a3f6fd6c7bea29e75ad8e (diff) | |
| parent | b96e6cde3e311cd79f8ad134291d41c8c64cc6ad (diff) | |
| download | emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.tar.gz emacs-ff672d2c8785de6faba84a400fb8153e9fa07cd2.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-14 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * configure.in: Add emacsgtkfixed.o to GTK_OBJ if HAVE_GTK3. | ||
| 4 | |||
| 1 | 2011-06-08 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2011-06-08 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * lib/gnulib.mk, m4/gnulib-common.m4: Merge from gnulib. | 7 | * lib/gnulib.mk, m4/gnulib-common.m4: Merge from gnulib. |