OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jul 2021 23:32:51 +0000 (08:32 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jul 2021 23:32:51 +0000 (08:32 +0900)
commitd8823b2840de473b7bb4840f9199d255076a9daa
tree221a79c223380e8466ba6fcb9c7fcf88a8148607
parentf20259623c710017891eecad202bcd65bae89f47
parent075fd3938ce4990c32a9bd4930e3191989e8e807
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Translations/WinMerge/Turkish.po
Src/Constants.h
Src/MainFrm.cpp
Translations/WinMerge/Slovenian.po
Translations/WinMerge/Turkish.po