Stephen Birarda ef1ff01188 resolve conflicts on merge with upstream/master		2013-09-30 10:12:54 -07:00
..
audio	move audio and avatar classes into assignment-client target	2013-09-17 11:04:46 -07:00
avatars	Pupil dilation.	2013-09-26 15:48:11 -07:00
shared	resolve conflicts on merge with upstream/master	2013-09-30 10:12:54 -07:00
voxel-server-library	remove standalone voxel server	2013-09-19 22:09:03 -05:00
voxels	add support for global normals for voxels	2013-09-27 15:04:44 -07:00