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

author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 5 Jan 2020 04:42:08 +0000 (13:42 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 5 Jan 2020 04:42:08 +0000 (13:42 +0900)
commit	09d9a6e0b67dafa306b13716c41c5368c7a612ce
tree	ec11023b8ea54b136676f661d222df04f74a26c5	tree \| snapshot
parent	f84abf6175cb46c049dcd44d01ce90dc05611b00	commit \| diff
parent	765471ba6f6c18c064dc418610ca85867869fa8f	commit \| diff

Merge branch 'master' of https://github.com/winmerge/winmerge into jp

Installer/InnoSetup/WinMerge.iss	diff1 \|	diff2 \|	blob \| history
Installer/InnoSetup/WinMergeX64.is6.iss	diff1 \|	diff2 \|	blob \| history
Installer/InnoSetup/WinMergeX64.iss	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/OptionsInit.cpp	diff1 \|	diff2 \|	blob \| history
Src/resource.h	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/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