Merging changes from trunk r58091-58323.
authorMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
commiteb21bdd249427465a093a078cda7864309a8f735
tree1da7dc7f6fd3670bf28b2bf00dfe7ec356344105
parent5ba2f4367d6cebc415c4e20572a8cea4e52fb0c3
parent20d6cd008b8a7b110fff3ca211651693916d9946
Merging changes from trunk r58091-58323.
CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt