OSDN Git Service

Merge with stable
authorsdottaka <none@none>
Sat, 25 Jan 2014 04:00:15 +0000 (13:00 +0900)
committersdottaka <none@none>
Sat, 25 Jan 2014 04:00:15 +0000 (13:00 +0900)
commitd78e07678f954842c933d38c8e7276bc9b33cc1c
tree3c4a3ad3184c438b2f1bba464d0f9a40c6953276
parentd16f457f508193379f864dd5481f5896c7d5f9fd
parent3d72e79e915a224dccefd10c34ac20c9f3141e62
Merge with stable
Src/DiffWrapper.cpp
Src/MergeDoc.cpp
Src/MergeDocLineDiffs.cpp
Src/MergeEditView.cpp
Src/OpenView.cpp