Andrzej Kapolka c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: voxel-server/src/main.cpp		2013-05-08 11:56:03 -07:00
..
resources	moved voxels file to resources directory	2013-05-08 10:11:56 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-08 11:56:03 -07:00
CMakeLists.txt	code review cleanup	2013-04-22 15:10:18 -07:00