OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 06:29:04 +0000 (15:29 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Tue, 17 Feb 2015 06:29:04 +0000 (15:29 +0900)
commitabfa570d4a008e77be4a18a6d8c2cdf10c2c9b97
treee6230e9f4214f714cd52c44a6ca3a4229ce1f6f1
parent7e720c227abb05f1e22febdda0568415d86f4c83
parentbbf9388131bc5330370f565662f2d88038265a68
Merge with stable
Src/7zCommon.cpp
Src/DiffItem.h
Src/DirActions.cpp
Src/DirActions.h
Src/DirDoc.cpp
Src/DirDoc.h
Src/DirView.cpp
Src/DirViewColItems.cpp
Translations/WinMerge/English.pot