diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /nt/ChangeLog | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'nt/ChangeLog')
| -rw-r--r-- | nt/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index baa7003f5ae..1a0746b3181 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-06-25 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * configure.bat: Add warning to the help text about using the | ||
| 4 | MSYS/MinGW building procedure. | ||
| 5 | |||
| 1 | 2013-06-07 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-06-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * INSTALL.MSYS: mingw-get is not a GUI program (yet). | 8 | * INSTALL.MSYS: mingw-get is not a GUI program (yet). |