summaryrefslogtreecommitdiff
path: root/merge/mrg_def.h
Commit message (Expand)AuthorAgeFilesLines
* Update copyrightunknown2001-12-061-3/+3
* Updated manual about embedded version.unknown2001-10-081-0/+29