OSDN Git Service

Merge branch 'master' of https://github.com/fluxer/katie
authorIvailo Monev <xakepa10@gmail.com>
Wed, 9 Mar 2016 17:45:15 +0000 (19:45 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 9 Mar 2016 17:45:15 +0000 (19:45 +0200)
commit61cb795736fa259928f060dde6216bd11538f6de
treedf29946531265f239cdd9110ebfaf93556f12bb9
parent00dfcccb1aad951df056c17671e04ddb5b9246fb
parentf8585337cc66a03b3f3cfea2e81c31d2b07ed739
Merge branch 'master' of https://github.com/fluxer/katie
CMakeLists.txt