OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jun 2023 11:36:10 +0000 (20:36 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jun 2023 11:36:10 +0000 (20:36 +0900)
commitcd7f39991c24cf28997a4021e4c01f2635fb1659
tree794e4784e06c6739dc4c711d3c6d3cbcbe59a5a1
parentae0a45c91e5cc758d096ff7d649e64ed73da2739
parent0c719bfeeb13ef53797e4a25e3b06e740b918331
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Version.h
49 files changed:
BuildArc.cmd
Docs/Users/ChangeLogJapanese.md
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/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