Changeset 2509 for code/branches/buildsystem2/src/core/LuaBind.h
- Timestamp:
- Dec 17, 2008, 8:59:48 PM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2
- Property svn:ignore deleted
- Property svn:mergeinfo changed
/code/branches/buildsystem (added) merged: 1875,1882-1886,1975-1982,1991,1999,2054,2061,2135,2137-2139,2197-2199,2204,2214-2220,2223-2224,2229,2233-2244,2248-2249,2252-2253,2260,2275
-
code/branches/buildsystem2/src/core/LuaBind.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/buildsystem/src/core/Script.h merged eligible /code/branches/questsystem2/src/core/LuaBind.h merged eligible /code/branches/buildsystem/src/core/LuaBind.h 1874-2276 /code/branches/ceguilua/src/core/LuaBind.h 1802-1808 /code/branches/core3/src/core/LuaBind.h 1572-1739 /code/branches/gcc43/src/core/LuaBind.h 1580 /code/branches/gui/src/core/LuaBind.h 1635-1723 /code/branches/input/src/core/LuaBind.h 1629-1636 /code/branches/objecthierarchy/src/core/LuaBind.h 1911-2085,2100,2110-2169 /code/branches/pickups/src/core/LuaBind.h 1926-2086 /code/branches/questsystem/src/core/LuaBind.h 1894-2088 /code/branches/script_trigger/src/core/LuaBind.h 1295-1953,1955 /code/branches/weapon/src/core/LuaBind.h 1925-2094
r2087 r2509 39 39 40 40 extern "C" { 41 #include <lua /lua.h>41 #include <lua.h> 42 42 } 43 43 … … 45 45 #include <string> 46 46 47 namespace orxonox // tolua_export 48 { // tolua_export 47 // tolua_begin 48 namespace orxonox 49 { 49 50 class _CoreExport LuaBind 50 51 { 51 /* 52 class LuaBind { // tolua_export 53 */ 52 53 // tolua_end 54 54 struct LoadS { 55 55 const char *s; -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.