fixed merge with test and bluemonkey commits
authorKevron Rees <tripzero.kev@gmail.com>
Thu, 6 Jun 2013 15:15:26 +0000 (08:15 -0700)
committerKevron Rees <tripzero.kev@gmail.com>
Thu, 6 Jun 2013 15:15:26 +0000 (08:15 -0700)
commit894eb4dfdef7bc9c1fed2333f7fc0c79267ce637
tree666a15d97a7f749e1556417a25e81d0b353d2a52
parent061b05528e76112690c7244afc343a6b801a383f
parent96a068e4911a5e98d09181548183765caaa300d7
fixed merge with test and bluemonkey commits
CMakeLists.txt
plugins/CMakeLists.txt