diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /nextstep/ChangeLog | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'nextstep/ChangeLog')
| -rw-r--r-- | nextstep/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 909580296e1..d76d832555c 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * templates/Info-gnustep.plist.in: Add NSDocumentClass EmacsDocument. | ||
| 4 | |||
| 1 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * Makefile.in (${ns_appdir}): Add touch. | 7 | * Makefile.in (${ns_appdir}): Add touch. |