OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 22 Aug 2021 00:51:32 +0000 (09:51 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 22 Aug 2021 00:51:32 +0000 (09:51 +0900)
commit242aa591b49d8ada1ef5d5966b04b070a8a0b197
tree11d1cb5d1eccfc614ec2e3472929adb8b2b39437
parent191e1eb2267eef242942a180caec23dace387532
parentbc47b94416e173c3413199d9cc6c09e8854e8887
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# BuildArc.cmd
# Src/MainFrm.cpp
# Src/OptionsInit.cpp
# Translations/WinMerge/Brazilian.po
# Translations/WinMerge/Turkish.po
47 files changed:
BuildArc.cmd
Installer/InnoSetup/WinMerge.iss
Installer/InnoSetup/WinMergeARM64.is6.iss
Installer/InnoSetup/WinMergeX64.is6.iss
Installer/InnoSetup/WinMergeX64.iss
Installer/InnoSetup/WinMergeX64NonAdmin.iss
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.rc
Src/OptionsDef.h
Src/OptionsInit.cpp
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/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