diff options
| author | Glenn Morris | 2012-05-14 09:11:24 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-14 09:11:24 -0700 |
| commit | 2f4cadd1da7b681171c60fab8499f23f37ce4cb2 (patch) | |
| tree | 0091b84465c7a70fa75a64b1d5fc9f294581df5a /doc/misc | |
| parent | d372248073cecc1d8ae1d6bed826692eab16274d (diff) | |
| download | emacs-2f4cadd1da7b681171c60fab8499f23f37ce4cb2.tar.gz emacs-2f4cadd1da7b681171c60fab8499f23f37ce4cb2.zip | |
ChangeLog merge fixes
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 812ec0214b0..c7dd1d3fa82 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2012-05-12 Andreas Schwab <schwab@linux-m68k.org> | 1 | 2012-05-14 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 2 | ||
| 3 | * cc-mode.texi: Avoid space before macro in 4th argument of cross | 3 | * cc-mode.texi: Avoid space before macro in 4th argument of cross |
| 4 | reference commands. (Bug#11461) | 4 | reference commands. (Bug#11461) |