OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a998ca 5c02f54)
Merge branch 'stable' of c:\dev\winmerge-stable
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 10 Jan 2021 06:51:51 +0000 (15:51 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 10 Jan 2021 06:51:51 +0000 (15:51 +0900)
# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot


Trivial merge
About OSDN
Find Software
Develop Software
Help