Mercurial > emacs
comparison etc/ChangeLog @ 111949:93bf3f082e91
ChangeLog merge fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 13 Dec 2010 09:26:01 -0800 |
| parents | c00190a8c8ef |
| children | 35774431238d |
comparison
equal
deleted
inserted
replaced
| 111948:cbde616eefa5 | 111949:93bf3f082e91 |
|---|---|
| 1 2010-12-13 W. Martin Borgert <debacle@debian.org> (tiny change) | 1 2010-12-13 W. Martin Borgert <debacle@debian.org> (tiny change) |
| 2 | 2 |
| 3 * schema/schemas.xml: Add DocBook (Bug#7491). | 3 * schema/schemas.xml: Add DocBook (Bug#7491). |
| 4 | 4 |
| 5 2010-12-13 Ulrich Mueller <ulm@gentoo.org> | |
| 6 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> | 5 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> |
| 7 | 6 |
| 8 * refcards/orgcard.tex: Cleanup. | 7 * refcards/orgcard.tex: Cleanup. |
| 9 | 8 |
| 10 2010-11-27 Ulrich Mueller <ulm@gentoo.org> | 9 2010-11-27 Ulrich Mueller <ulm@gentoo.org> |