Brad Hefta-Gaub 483155f246 Merge pull request #3989 from birarda/master ... fix luckily linked dependencies in prep for shared hifi libraries		2014-12-21 11:34:43 -08:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents	2014-12-19 10:35:18 -08:00
CMakeLists.txt	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00