OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e87918 5cbe80b)
Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 25 Aug 2021 13:25:32 +0000 (22:25 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 25 Aug 2021 13:25:32 +0000 (22:25 +0900)
commit580514c4090386a1ce60ca32270a80267b3b84e1
treea9a1250239563af27a8b11019a5cfb7159445d03tree | snapshot
parent2e8791868d096ba05706d573a1ab22421f91359fcommit | diff
parent5cbe80bee6e477d0ae99a5d642bddb01f993601ecommit | diff
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
44 files changed:
Installer/InnoSetup/WinMerge.iss diff1 | diff2 | blob | history
Installer/InnoSetup/WinMergeARM64.is6.iss diff1 | diff2 | blob | history
Installer/InnoSetup/WinMergeX64.is6.iss diff1 | diff2 | blob | history
Installer/InnoSetup/WinMergeX64.iss diff1 | diff2 | blob | history
Installer/InnoSetup/WinMergeX64NonAdmin.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
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