diff options
| author | Grégoire Jadi | 2013-06-12 17:06:09 +0200 |
|---|---|---|
| committer | Grégoire Jadi | 2013-06-12 17:06:09 +0200 |
| commit | 32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc (patch) | |
| tree | 578be4eb2757a0716f252a269adc49fa9406556d /admin/ChangeLog | |
| parent | 5c77269b59c8d8d88fa91ec2c949294db1bb2131 (diff) | |
| parent | e6fa6da6899bf1b4877b96c450eae3934085d560 (diff) | |
| download | emacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.tar.gz emacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.zip | |
Merge branch 'jave-xwidget' into xwidget
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. |