Commit Graph

2 Commits

Author SHA1 Message Date
Jordan Brown
e37a9a36ed Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger
Add a Python script to fix DMI conflicts
2018-05-25 10:55:33 -05:00
Tad Hardesty
f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00