Commit Graph

3 Commits

Author SHA1 Message Date
GinjaNinja32
627626c49d Automatic DMI merge stuff 2014-11-26 21:28:40 +00:00
Mloc-Argent
f928d9ce77 repo: make changelog easier to merge
The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-06-12 18:43:15 +01:00
cib
79e4bfec2c Added merge driver for .dmm files. 2012-11-11 01:02:19 +01:00