summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update UserMerge to 1.35Brian Evans2020-10-0291-450/+451
* Update UserMerge for 1.32Brian Evans2019-04-1139-195/+318
* UserMerge: Update to REL_1_30Brian Evans2018-11-2078-470/+425
* Add initial set of additional extensionsAlex Legler2014-12-2397-0/+2741