OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 15 Feb 2015 10:14:27 +0000 (19:14 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 15 Feb 2015 10:14:27 +0000 (19:14 +0900)
commit7e720c227abb05f1e22febdda0568415d86f4c83
tree6603db0c570c1063de33c7640ae3b6e34e907ce4
parent3fab4b34f949c3d22f06c805972f21c1610e479c
parent9b0ef5366a008bb9c0abe722b3cb811976be22da
Merge with stable
Src/HexMergeView.cpp