From 4b9287ef8a06a26cf3aecd3a53b9ba2770da0da6 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 15 Sep 2014 10:22:52 +0200
Subject: [PATCH] Fixed last merge round

---
 companion/src/firmwares/opentx/opentxTaranisSimulator.cpp | 1 -
 radio/src/Makefile                                        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index 7b5d33427..866a56052 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -164,7 +164,6 @@ inline int geteepromsize() {
 #include "radio/src/lua/src/lauxlib.c"
 #include "radio/src/lua/src/ltablib.c"
 #include "radio/src/lua/src/lcorolib.c"
-#include "radio/src/lua/src/lbitlib.c"
 
   
 int16_t g_anas[NUM_STICKS+5];
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 23df90e8f..f69974659 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -736,7 +736,7 @@ ifeq ($(PCB), TARANIS)
     INCDIRS += lua/src
     CPPSRC += lua.cpp
     LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \
-           lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \
+           lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/lrotable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \
            lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/lbitlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c
     SRC += $(LUASRC) 
     LUADEP = lua_exports.cpp