Andrew Meadows 4e51aee00b Merge latest upstream into local repo.		2014-01-15 17:04:33 -08:00
..
audio	resolve conflicts on merge with upstream master	2014-01-14 16:15:58 -08:00
avatars	Moving SIXENSE_CONTROLLER_ID* constants into header to help eliminate magic numbers in other code (to be committed later).	2014-01-15 16:53:27 -08:00
metavoxels	initial newline removal from all QDebug calls	2014-01-14 13:09:22 -08:00
octree	resolve conflicts on merge with upstream master	2014-01-14 16:15:58 -08:00
octree-server	resolve conflicts on merge with upstream master	2014-01-14 16:15:58 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	Uncommenting particle shift on penetration.	2014-01-15 17:03:07 -08:00
script-engine	initial newline removal from all QDebug calls	2014-01-14 13:09:22 -08:00
shared	Merge latest upstream into local repo.	2014-01-15 17:04:33 -08:00
voxel-server	initial newline removal from all QDebug calls	2014-01-14 13:09:22 -08:00
voxels	resolve conflicts on merge with upstream master	2014-01-14 16:15:58 -08:00