Jeffrey Ventrella bbd85664d6 Merge remote-tracking branch 'upstream/master'		2013-05-08 19:24:07 -07:00
..
avatars	put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer	2013-05-08 19:22:21 -07:00
shared	Merge remote-tracking branch 'upstream/master'	2013-05-08 19:24:07 -07:00
voxels	lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing	2013-05-08 18:06:13 -07:00