diff options
Diffstat (limited to '')
| -rw-r--r-- | source/Bindings.h | 6 |
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 */ |