OSDN Git Service

Merge branch 'master' of https://github.com/sdottaka/winmerge-v2
authorGreyMerlin <GreyMerlin7@gmail.com>
Thu, 16 Mar 2017 19:03:38 +0000 (12:03 -0700)
committerGreyMerlin <GreyMerlin7@gmail.com>
Thu, 16 Mar 2017 19:03:38 +0000 (12:03 -0700)

Trivial merge