diff options
| author | Joakim Verona | 2013-06-14 23:54:26 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-14 23:54:26 +0200 |
| commit | 2a342ba649407875a265b8d56c9f7c3d87c4b43c (patch) | |
| tree | d9e2cb1a6c10854cf55a018b14d2b0cef48eafaf /admin/ChangeLog | |
| parent | e32984567a0e1c100011adee2311cbc1fdf61433 (diff) | |
| parent | 230dcbaf2ff0615d72c5d2ca41edb999b6bc1b87 (diff) | |
| download | emacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.tar.gz emacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.zip | |
Merge branch 'trunk' into xwidget
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 | ||