OSDN Git Service

Merge with stable
authorsdottaka <none@none>
Mon, 20 Jan 2014 14:53:13 +0000 (23:53 +0900)
committersdottaka <none@none>
Mon, 20 Jan 2014 14:53:13 +0000 (23:53 +0900)
commit513b71d6e33890b28357415afc155ce863ed09cc
tree602d1b6f0fc3a5da17ae7888c4a99b04be1ec600
parent27ce1edeb5e68e303b2e797ccda16cc876280e09
parent770d4575591f61fa96a3061116db93e62afd92a7
Merge with stable
Src/DiffList.cpp
Src/DiffWrapper.cpp
Src/FolderCmp.cpp
Src/LocationView.cpp
Src/MergeDocLineDiffs.cpp
Src/MergeEditView.cpp
Src/MergeEditView.h