diff options
| author | Tom Tromey | 2013-06-13 11:29:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-06-13 11:29:06 -0600 |
| commit | 5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da (patch) | |
| tree | af9b79246f0b18d748c3e1c33b1bb1b33cf1fbe0 /admin/ChangeLog | |
| parent | 313dfb6277b3e1ef28c7bb76e776f10168e3f0a3 (diff) | |
| parent | 94fa6ec7b306b47c251f7b8b67662598027a7ff3 (diff) | |
| download | emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.tar.gz emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.zip | |
merge from trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ac6031fa205..8fdfe3965b1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,9 +1,12 @@ | |||
| 1 | 2013-06-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * admin.el (manual-style-string): Use new file manual.css. | ||
| 4 | |||
| 1 | 2013-06-02 Eric Ludlam <zappo@gnu.org> | 5 | 2013-06-02 Eric Ludlam <zappo@gnu.org> |
| 2 | 6 | ||
| 3 | * grammars/srecode-template.wy (variable): Accept a single number | 7 | * grammars/srecode-template.wy (variable): Accept a single number |
| 4 | as a variable value. Allows the 'priority' to be set to a number. | 8 | 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 | 9 | (wisent-srecode-template-lexer): Move number up so it can be created. |
| 6 | created. | ||
| 7 | 10 | ||
| 8 | 2013-05-16 Glenn Morris <rgm@gnu.org> | 11 | 2013-05-16 Glenn Morris <rgm@gnu.org> |
| 9 | 12 | ||