summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update UserMerge to 1.35Brian Evans2020-10-021-6/+3
* Update UserMerge for 1.32Brian Evans2019-04-111-7/+8
* UserMerge: Update to REL_1_30Brian Evans2018-11-201-12/+8
* Add initial set of additional extensionsAlex Legler2014-12-231-0/+42