summaryrefslogtreecommitdiffstats
path: root/source/Bindings.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-12 17:58:29 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-12 17:58:29 +0200
commit25cda4e8b4844aecf8cdc70ffcab8e0adaab3486 (patch)
treeb1fc6c925636c965f2df2fe1cb3d65e14181f5ce /source/Bindings.h
parentConverted the Noise3D generator to optimized noise and lerp (diff)
downloadcuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar.gz
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar.bz2
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar.lz
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar.xz
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.tar.zst
cuberite-25cda4e8b4844aecf8cdc70ffcab8e0adaab3486.zip
Diffstat (limited to '')
-rw-r--r--source/Bindings.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/Bindings.h b/source/Bindings.h
index 1965974d1..733a8e3de 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,10 +1,6 @@
/*
** Lua binding: AllToLua
-<<<<<<< .mine
-** Generated automatically by tolua++-1.0.92 on 05/09/13 14:14:48.
-=======
-** Generated automatically by tolua++-1.0.92 on 05/08/13 11:35:08.
->>>>>>> .r1462
+** Generated automatically by tolua++-1.0.92 on 05/12/13 17:56:56.
*/
/* Exported function */