Stephen Birarda ede32b5f1a resolve conflicts on merge with upstream master		2014-03-05 15:31:00 -08:00
..
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes	2014-03-03 16:31:25 -08:00
avatars	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
embedded-webserver	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00
metavoxels	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00
octree	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
particles	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00
script-engine	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00
shared	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00
voxels	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00