diff options
Diffstat (limited to '')
| -rw-r--r-- | source/Bindings.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/Bindings.h b/source/Bindings.h index e80650e8b..1965974d1 100644 --- a/source/Bindings.h +++ b/source/Bindings.h @@ -1,6 +1,10 @@ /* ** 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 */ /* Exported function */ |