Stephen Birarda 219e78425b resolve conflicts on merge with upstream master		2015-02-06 09:49:46 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
audio-client	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-02-04 15:16:23 -08:00
avatars	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4231 from ZappoMan/crashonexit	2015-02-04 16:16:56 -08:00
entities-renderer	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
gpu	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
metavoxels	Settings update	2015-02-03 12:27:30 -08:00
model	First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture	2015-01-20 16:02:26 -08:00
networking	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
octree	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
physics	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
render-utils	Getting rid of some warnings	2015-02-05 21:00:34 -08:00
script-engine	A further custom User-Agent string	2015-01-30 15:56:01 -08:00
shared	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00