OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@sourceforge.net>
Tue, 28 Jan 2014 14:01:52 +0000 (23:01 +0900)
committersdottaka <sdottaka@sourceforge.net>
Tue, 28 Jan 2014 14:01:52 +0000 (23:01 +0900)
commit94c63b1ac3a244624c99ca4dd07e2ee3d348b57c
tree63e5ab14185470f8dfd182a7ea48c4c2f2d5e69b
parent1c6c8b9af7588b4c684a42d02cfeaf0c435e53da
parent2f47b97fd6ede08cb2982f5f089e65e212f4c652
Merge with stable
Src/Merge.cpp