OSDN Git Service

Merge remote-tracking branch 'upstream/master' into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 25 Feb 2020 23:25:24 +0000 (08:25 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 25 Feb 2020 23:25:24 +0000 (08:25 +0900)
commitc946ea08e2164021365966eb2ce17321596ad19e
tree65c8517c3295f56ef8dc212420d72b23ed8a5b38
parentc06b62a4302e531ac6487327641f0b941bf88844
parent9c18ddffcd310abc4612358fbd3239730088807f
Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
# SetVersion.cmd
# Translations/WinMerge/Russian.po
# Version.h
SetVersion.cmd
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/German.po
Translations/WinMerge/Lithuanian.po
Translations/WinMerge/Russian.po
Translations/WinMerge/Spanish.po
Version.h