OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 17 Jul 2021 00:51:00 +0000 (09:51 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 17 Jul 2021 00:51:00 +0000 (09:51 +0900)
commitb4f45d83476d1f853f619b46481497166ae2b9db
tree08ca474b421fe2e419f54f70a3913cf032393117
parent0eea2bcbe08644d909225fc98cd7c46f809119c1
parent313e152399238e06bce5d2ef57b8096c4e43a861
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Externals/freeimage
# Externals/frhed
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
# Translations/WinMerge/Galician.po
# Translations/WinMerge/Japanese.po
43 files changed:
Installer/InnoSetup/WinMerge.iss
Installer/InnoSetup/WinMergeX64.is6.iss
Installer/InnoSetup/WinMergeX64.iss
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/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