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 /admin/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 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 221d5c0586c..ac6031fa205 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-06-02 Eric Ludlam <zappo@gnu.org> | ||
| 2 | |||
| 3 | * grammars/srecode-template.wy (variable): Accept a single number | ||
| 4 | as a variable value. Allows the 'priority' to be set to a number. | ||
| 5 | (wisent-srecode-template-lexer): Move number up so it can be | ||
| 6 | created. | ||
| 7 | |||
| 1 | 2013-05-16 Glenn Morris <rgm@gnu.org> | 8 | 2013-05-16 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * cus-test.el (cus-test-cus-load-groups): New function. | 10 | * cus-test.el (cus-test-cus-load-groups): New function. |