OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 26 Jan 2023 14:17:07 +0000 (23:17 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 26 Jan 2023 14:17:07 +0000 (23:17 +0900)
commit05c605a5d283b0d37444d2e0588c83c26ea00e92
tree2d496539d777e273b5cd971b095e09e43c9018bc
parentc05fc86aa72f246802feeea9e64cc28391cf28df
parent3c7984f0fcdd5002a8bfee8b950990b804f49016
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Src/Constants.h
# Version.h
49 files changed:
BuildArc.cmd
Installer/InnoSetup/WinMergeARM64.is6.iss
Installer/InnoSetup/WinMergeX64.is6.iss
Installer/InnoSetup/WinMergeX64.iss
Installer/InnoSetup/WinMergeX64NonAdmin.iss
Installer/InnoSetup/WinMergeX86.iss
SetVersion.cmd
Src/Constants.h
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.rc
Translations/WinMerge/Arabic.po
Translations/WinMerge/Basque.po
Translations/WinMerge/Brazilian.po
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/Catalan.po
Translations/WinMerge/ChineseSimplified.po
Translations/WinMerge/ChineseTraditional.po
Translations/WinMerge/Corsican.po
Translations/WinMerge/Croatian.po
Translations/WinMerge/Czech.po
Translations/WinMerge/Danish.po
Translations/WinMerge/Dutch.po
Translations/WinMerge/English.pot
Translations/WinMerge/Finnish.po
Translations/WinMerge/French.po
Translations/WinMerge/Galician.po
Translations/WinMerge/German.po
Translations/WinMerge/Greek.po
Translations/WinMerge/Hungarian.po
Translations/WinMerge/Italian.po
Translations/WinMerge/Japanese.po
Translations/WinMerge/Korean.po
Translations/WinMerge/Lithuanian.po
Translations/WinMerge/Norwegian.po
Translations/WinMerge/Persian.po
Translations/WinMerge/Polish.po
Translations/WinMerge/Portuguese.po
Translations/WinMerge/Romanian.po
Translations/WinMerge/Russian.po
Translations/WinMerge/Serbian.po
Translations/WinMerge/Sinhala.po
Translations/WinMerge/Slovak.po
Translations/WinMerge/Slovenian.po
Translations/WinMerge/Spanish.po
Translations/WinMerge/Swedish.po
Translations/WinMerge/Turkish.po
Translations/WinMerge/Ukrainian.po
Version.h