OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 29 Mar 2015 11:42:55 +0000 (20:42 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 29 Mar 2015 11:42:55 +0000 (20:42 +0900)
commitbd13a130478d39d6961c4aa166947a8e01e1652a
tree6f0ea2d58a888cdc0c31b07cc3413610bf5a9ea4
parent0766f433fac08c1850091fea31309ecdca81d68a
parent132a3fbb749a289eafe8e0ad6dd98212e7262ca1
Merge with stable
Src/ChildFrm.cpp
Src/Constants.h
Src/DirFrame.cpp
Src/DirViewColItems.cpp
Src/HexMergeFrm.cpp
Src/ImgMergeFrm.cpp
Src/MainFrm.cpp
Src/MainFrm.h
Translations/WinMerge/English.pot