Stephen Birarda d5b1bee13c resolve conflicts on merge with upstream master		2014-08-08 13:48:32 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
avatars	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
embedded-webserver	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
fbx	remove ROOT_DIR param in include_glm, remove ROOT_DIR from root CMakeLists	2014-08-08 13:22:00 -07:00
metavoxels	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
models	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
networking	link the socket library to the hifi networking library	2014-08-08 13:31:09 -07:00
octree	remove OpenSSL requirement from octree library	2014-08-08 13:18:32 -07:00
particles	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
script-engine	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
shared	resolve conflicts on merge with upstream master	2014-08-08 13:48:32 -07:00
voxels	make Qt5 and ZLIB required finds, add OpenSSL to interface	2014-08-08 13:17:54 -07:00