OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8feed49 a6f87ac)
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 27 Nov 2021 13:25:02 +0000 (22:25 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 27 Nov 2021 13:25:02 +0000 (22:25 +0900)
commit90bb54c4cacbb753ea20e266b657ae0ad4cd847c
tree0ec1fe0556cd7d8a00e182007e8f75ad35ca2f58tree | snapshot
parent8feed49cb86e4a2aced701b3a960d34b3bd7170acommit | diff
parenta6f87acda5f0ada823b7a5eca4276c7067352fcacommit | diff
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Externals/freeimage
# Externals/frhed
# Externals/winimerge
# Translations/WinMerge/Polish.po
42 files changed:
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
Src/resource.h 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/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
About OSDN
Find Software
Develop Software
Help