flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into noreturn

Browse Source 
Conflicts:
	SetFlags.cmake
This commit is contained in:
Tycho
2014-03-14 08:04:48 -07:00
parent 8e11c270fc adf5a60746
commit 693e59c6a4
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BoundingBox.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#if SELF_TEST
#ifdef SELF_TEST
/** A simple self-test that is executed on program start, used to verify bbox functionality */
static class SelfTest_BoundingBox
src/CompositeChat.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#if SELF_TEST
#ifdef SELF_TEST
/** A simple self-test that verifies that the composite chat parser is working properly. */
class SelfTest_CompositeChat
src/Noise.cpp
-8
View File
@@ -3,14 +3,6 @@
#include "Noise.h"
#if NOISE_USE_SSE
#include <smmintrin.h> //_mm_mul_epi32
#endif
#define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x))