diff options
| author | Glenn Morris | 2012-05-26 18:06:44 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-26 18:06:44 -0700 |
| commit | 33017fafd17d722e82a268e9b272f27df261e09d (patch) | |
| tree | 9c34640f09d51059804961d697ed9b07e19571d3 /doc/misc/ChangeLog | |
| parent | caf8a9b2b301aba06735d403317b75b41df59bfe (diff) | |
| parent | ed7bebbb489cf6f893fc35a2a6714b0d8e7e8a90 (diff) | |
| download | emacs-33017fafd17d722e82a268e9b272f27df261e09d.tar.gz emacs-33017fafd17d722e82a268e9b272f27df261e09d.zip | |
Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a10f65b085c..82e6a2f70ae 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,7 +1,10 @@ | |||
| 1 | 2012-05-27 Bastien Guerry <bzg@gnu.org> | ||
| 2 | |||
| 3 | * org.texi (Durations and time values): Fix typo. | ||
| 4 | |||
| 1 | 2012-05-19 Jay Belanger <jay.p.belanger@gmail.com> | 5 | 2012-05-19 Jay Belanger <jay.p.belanger@gmail.com> |
| 2 | 6 | ||
| 3 | * doc/misc/calc.texi | 7 | * doc/misc/calc.texi (Basic Operations on Units, Customizing Calc): |
| 4 | (Basic Operations on Units, Customizing Calc): | ||
| 5 | Mention `calc-ensure-consistent-units'. | 8 | Mention `calc-ensure-consistent-units'. |
| 6 | 9 | ||
| 7 | 2012-05-14 Andreas Schwab <schwab@linux-m68k.org> | 10 | 2012-05-14 Andreas Schwab <schwab@linux-m68k.org> |