Mercurial > emacs
diff admin/ChangeLog @ 111267:7f0afd30f764
More merge fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 31 Oct 2010 19:38:16 +0100 |
parents | 4a4cd5021b94 |
children | 2278399d2eb9 |
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 31 Oct 2010 19:38:16 +0100 |
parents | 4a4cd5021b94 |
children | 2278399d2eb9 |