OSDN Git Service

Merge branch 'project_uwp'
authorkonekoneko <test2214@hotmail.co.jp>
Tue, 27 Sep 2016 18:46:29 +0000 (00:16 +0530)
committerkonekoneko <test2214@hotmail.co.jp>
Tue, 27 Sep 2016 18:46:29 +0000 (00:16 +0530)
commit604fb06a6bbf81d90bd7660deb8203a9fe86e684
tree96c26409dd9b34d3179df9d7e4b09caa5db61125
parentb803489616b6907d13823e010a4e22441d19a982
parentd84f8e7a735ff0791e3c360b24709810e5df358f
Merge branch 'project_uwp'

# Conflicts:
# UWP/FooEditEngine.UWP/strings/en-US/Resources.resw