Mercurial > hg
view contrib/wix/COPYING.rtf @ 30161:339f9d93daa6
merge: only show "cannot merge flags for %s" warning if flags are different
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Oct 2016 12:22:18 +0200 |
parents | f6d73c8756e2 |
children | 854a7315603e |