Howard Stearns ee93e1d300 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader		2015-05-01 09:51:15 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	Move "Stereo Audio" option into developerMenu.js	2015-04-28 14:14:10 -07:00
audio-client	Move "Stereo Audio" option into developerMenu.js	2015-04-28 14:14:10 -07:00
avatars	Merge pull request #4722 from birarda/avatar-mixer-debug	2015-04-29 10:00:24 -07:00
embedded-webserver	try again without macro	2015-04-07 09:59:04 -07:00
entities	don't save default values in json file	2015-04-30 11:28:27 -07:00
entities-renderer	Merge pull request #4712 from Atlante45/compound_zones_fix	2015-04-28 09:48:05 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into objReader	2015-05-01 09:51:15 -07:00
gpu	respond to code-review	2015-04-25 10:50:18 -07:00
model	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
networking	don't give timers owners while also keeping track of them in as class instance variables	2015-04-29 19:18:58 -07:00
octree	Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values	2015-04-30 11:28:33 -07:00
physics	merge upstream/master into andrew/bispinor	2015-04-28 15:18:02 -07:00
render-utils	Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch.	2015-04-30 08:53:19 -07:00
script-engine	Merge pull request #4721 from ctrlaltdavid/20514	2015-04-28 20:44:09 -07:00
shared	don't save default values in json file	2015-04-30 11:28:27 -07:00
ui	Fix crash cause when Menu::instance() is before offscreen ui startup	2015-04-27 22:58:09 -07:00