OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 28 Feb 2021 12:34:57 +0000 (21:34 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 28 Feb 2021 12:34:57 +0000 (21:34 +0900)
commit7c33c26bc71022a6fe2870929f83a75b0240d5a2
treea3c2772fef8db56781f4721dbec65356af843760
parent5d592077c4aa9fdf5f2d5075370a2b3761e5c49e
parent59375bee75c3aa71a5b104fcd62a36145669a588
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# .hgtags
# Externals/freeimage
# Externals/frhed
42 files changed:
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.rc
Src/OptionsInit.cpp
Src/resource.h
Testing/Data/Fileformats/VHDL.vhd
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