OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jul 2021 10:22:31 +0000 (19:22 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 25 Jul 2021 10:22:31 +0000 (19:22 +0900)
commitf20259623c710017891eecad202bcd65bae89f47
treeb37f5d9d5538906f906de92b6ff2cb4ddb1ed171
parent7b6b727d1e8c1a61ef5fb043202eb560dc11de33
parentd685b92eb6bd138e0fa1b1d7f08eb867cd919c55
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Translations/WinMerge/English.pot
# Translations/WinMerge/Portuguese.po
# Version.h
41 files changed:
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/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