Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jeffrey Ventrella 2013-05-06 12:36:14 -07:00
commit d77a86fc6f

View file

@ -10,4 +10,5 @@ add_subdirectory(interface)
add_subdirectory(injector)
add_subdirectory(pairing-server)
add_subdirectory(space-server)
add_subdirectory(voxel-edit)add_subdirectory(voxel-server)
add_subdirectory(voxel-edit)
add_subdirectory(voxel-server)