Merge branch 'moritz_appl' of github.com:voxelinc/voxellancer into mo…

…ritz_appl
voxelinc · Apr 29, 2014 · 649315d · 649315d
2 parents cb09717 + 48db6bd
commit 649315d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
 # PROJECT DESCRIPTION
 set(META_PROJECT_NAME "voxellancer")
 set(META_VERSION_MAJOR "0")
-set(META_VERSION_MINOR "3")
-set(META_VERSION_PATCH "1")
+set(META_VERSION_MINOR "4")
+set(META_VERSION_PATCH "0")
 set(META_VERSION "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_AUTHOR_ORGANIZATION "voxelinc")
 set(META_AUTHOR_DOMAIN "https://github.com/voxelinc/voxellancer/")

diff --git a/test/perftest/testperformance.cpp b/test/perftest/testperformance.cpp
@@ -71,7 +71,7 @@ static void doSplitDetection(WorldObject* planet, WorldObjectModification &mod,
 
 go_bandit([](){
     describe("VoxelTree", [](){
-        World *world;
+        //World *world;
         PropertyManager::instance()->reset();
         PropertyManager::instance()->load("data/config.ini");
         PropertyManager::instance()->load("data/voxels.ini", "voxels");