OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 22 Mar 2015 12:00:29 +0000 (21:00 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 22 Mar 2015 12:00:29 +0000 (21:00 +0900)
commit46238984cd0cd4b0811c4987405571dda039c2b4
treee50228ccbb1cac957c258c86dba45ac2a5f6695b
parentf514ebba07a37268420d5113b00d6f4f6859c5a0
parentde97c9101957d5df6de264a4104434b51d1c66ec
Merge with stable
Src/Common/MDITabBar.cpp
Src/Merge.cpp
Src/Merge.h
Translations/WinMerge/English.pot