Merge branch 'develop' into feature/remote

This commit is contained in:
Joakim Kilby
2015-06-12 10:47:41 +02:00
35 changed files with 1246 additions and 73 deletions

View File

@@ -92,7 +92,7 @@ private:
lua_State* _state;
std::set<LuaLibrary> _registeredLibraries;
//sync variables
std::mutex _mutex;
std::vector<std::string> _queuedScripts;