Sam Gateau 8b78ca8dc1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0		2015-03-09 11:15:19 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio-client	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
avatars	Merge pull request #4300 from birarda/dependencies	2015-02-25 13:22:49 -08:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	Sync to upstream	2015-03-07 21:40:06 -08:00
entities-renderer	Sync to upstream	2015-03-07 21:40:06 -08:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	tweaks to hacks for detecting mixamo files	2015-03-06 15:11:02 -08:00
gpu	splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu	2015-03-09 11:14:42 -07:00
model	splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu	2015-03-09 11:14:42 -07:00
networking	Merge pull request #4381 from Atlante45/disk_cache	2015-03-08 11:40:40 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
physics	Merge pull request #4341 from AndrewMeadows/bispinor	2015-02-26 09:21:49 -08:00
render-utils	splitting the code of GLBackend into separate .cpp, adding the PIpeline,adn the state to gpu	2015-03-09 11:14:42 -07:00
script-engine	Merge pull request #4366 from ZappoMan/removeMetavoxels	2015-03-03 15:50:53 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00