summaryrefslogtreecommitdiff
path: root/.merlin
AgeCommit message (Expand)Author
2018-08-31sync and centralise the two .merlin filesJon French
2018-05-01make merlin ignore some unused variable warningsJon French
2017-08-02add .merlin fileJon French