diff options
author | Thomas Jost <schnouki@schnouki.net> | 2012-01-04 10:25:07 +0100 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-01-05 17:56:33 -0400 |
commit | e0991930c0ffe25db6fe3769b938df261dbc6531 (patch) | |
tree | 8ae55c74a7fd65c09653a44db697ee33d2f3ab5f /version | |
parent | 9981f995c6a4122f1adf4bac5febf31e3c147d26 (diff) |
Update NEWS for Emacs changes
- A fair amount of conflict resolution by db.
Diffstat (limited to 'version')
0 files changed, 0 insertions, 0 deletions