git.osdn.net Git - winmerge-jp/winmerge-jp.git/commit

author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Tue, 27 Dec 2022 12:39:21 +0000 (21:39 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Tue, 27 Dec 2022 12:39:21 +0000 (21:39 +0900)
commit	b6f2d896208054344e72719094ae08092d9a6371
tree	67fb9a19db2f5ad4483f4c52332a59709a75d1e8	tree \| snapshot
parent	a887d6925d1f349e3ff2f12a7fa5978d0f904803	commit \| diff
parent	625669af836b14f695a5a81c4597ed2c32b6b0d8	commit \| diff

Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Version.h

SetVersion.cmd	diff1 \|	diff2 \|	blob \| history
Src/MainFrm.cpp	diff1 \|	diff2 \|	blob \| history
Src/MainFrm.h	diff1 \|	diff2 \|	blob \| history
Src/Merge.rc	diff1 \|	diff2 \|	blob \| history
Src/OptionsDef.h	diff1 \|	diff2 \|	blob \| history
Src/OptionsInit.cpp	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Arabic.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Basque.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Brazilian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Bulgarian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Catalan.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/ChineseSimplified.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/ChineseTraditional.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Corsican.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Croatian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Czech.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Danish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Dutch.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/English.pot	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Finnish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/French.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Galician.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/German.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Greek.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Hungarian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Italian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Japanese.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Korean.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Lithuanian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Norwegian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Persian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Polish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Portuguese.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Romanian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Russian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Serbian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Sinhala.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Slovak.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Slovenian.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Spanish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Swedish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Turkish.po	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/Ukrainian.po	diff1 \|	diff2 \|	blob \| history
Version.h	diff1 \|	diff2 \|	blob \| history