OSDN Git Service

Merge branch 'develop' into macos-develop
authorEric Branlund <ebranlund@fastmail.com>
Sat, 2 Oct 2021 15:00:37 +0000 (08:00 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Sat, 2 Oct 2021 15:00:37 +0000 (08:00 -0700)
1  2 
src/Makefile.am
src/artifact/artifact-info.cpp

diff --cc src/Makefile.am
Simple merge
Simple merge