Merged latest trunk changes into scripting-branch

2013-09-01 20:00:56 +00:00
parent 4556210061 babfcaa0f3
commit cda2a4c0a5
18 changed files with 646 additions and 550 deletions
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "cmdscript.h"

+
 unsigned int current_command = CMD_UNKNOWN;
 //unsigned int received_command = CMD_UNKNOWN;
 //UsbCommand current_response;