cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-30 03:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 9 Branches 0 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
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