OSDN Git Service

Merge branch 'For2.2.2-Refactoring' into For2.2.2-Refactoring-Cocoa2
authorEric Branlund <ebranlund@fastmail.com>
Tue, 23 Jun 2020 18:25:49 +0000 (11:25 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Tue, 23 Jun 2020 18:25:49 +0000 (11:25 -0700)
commit49677fda72ae93056f0ea955ea1c23a1fc50faad
tree9ea6eff9a8581837b12b8149d755fe1bceb30266
parentc3515b1c5dfc3dbf079c557ced5485bc7708ee84
parent87e07a7ff21955183425aff8bb1cc730295a65d3
Merge branch 'For2.2.2-Refactoring' into For2.2.2-Refactoring-Cocoa2
src/Makefile.am
src/main/init.c