diff options
| author | Xue Fuqiao | 2013-06-04 07:34:27 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-06-04 07:34:27 +0800 |
| commit | c362f1950814689b0a6f03f0fa48b07784b90a16 (patch) | |
| tree | ecb082e3fcca890b57ddc42f733808cca5e782a3 /admin/ChangeLog | |
| parent | d3ffe17c6f56435ebd2aca787122a3982ac5fcb2 (diff) | |
| parent | b9110c6b2f796b5147b018c3d70df9d6af657eff (diff) | |
| download | emacs-c362f1950814689b0a6f03f0fa48b07784b90a16.tar.gz emacs-c362f1950814689b0a6f03f0fa48b07784b90a16.zip | |
Merge from mainline.
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. |