OSDN Git Service

Merge branch 'develop' into macos-develop
authorEric Branlund <ebranlund@fastmail.com>
Sun, 11 Apr 2021 13:47:34 +0000 (06:47 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Sun, 11 Apr 2021 13:47:34 +0000 (06:47 -0700)
commit18afd019c81102b4bf809a8163e2f28ca5856373
tree2df1c997dda0f3911f4f0d37e6f6513a0fafb2e9
parentab4444e1d92de8bc2194204743d368ceac35c48e
parentb31fc1d820ee8405704163fbef2e494e9f3d80a7
Merge branch 'develop' into macos-develop
src/Makefile.am
src/main-win.cpp