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 /test/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 'test/ChangeLog')
| -rw-r--r-- | test/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 56e019ec4af..98fb2e3da1f 100644 --- a/test/ChangeLog +++ b/test/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-05-31 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * automated/ruby-mode-tests.el: New tests, for percent literals | ||
| 4 | and expression expansion. | ||
| 5 | |||
| 1 | 2013-05-29 Leo Liu <sdl.web@gmail.com> | 6 | 2013-05-29 Leo Liu <sdl.web@gmail.com> |
| 2 | 7 | ||
| 3 | * indent/octave.m: Tweak. | 8 | * indent/octave.m: Tweak. |