Merge branch 'dev-gtest' into dev
authorkhizmax <libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:59 +0000 (13:28 +0300)
committerkhizmax <libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:59 +0000 (13:28 +0300)
commit7ab1cc74c4563cb13cba8b61a9095b0311ad59e7
tree64dc97578af988463996c2a19fdb87d4894c9555
parent9967ec1f441605d2de3838a31f9993750dcbff90
parent715bb84a10a3f2710c4751cac1d9c1996deefa1a
Merge branch 'dev-gtest' into dev