OSDN Git Service

Merge remote-tracking branch 'upstream/stable' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 14 Feb 2023 14:49:30 +0000 (23:49 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 14 Feb 2023 14:49:30 +0000 (23:49 +0900)
commit8f06c496976ee9fbe0ed1d200402dda847d3c1e5
tree12b9600c4a6604eea5b6deeb538c1e753736e568
parentfe0d92bfbf5507df8af6a64df80c911256b86953
parenta41371aa78b788c1a5711f1238c71982d5c8a298
Merge remote-tracking branch 'upstream/stable' into jp

# Conflicts:
# SetVersion.cmd
# Version.h
SetVersion.cmd
Version.h