Jason Turner
|
85ba42849b
|
Merge branch 'master' into ChaiScript_5_0_CPP_11
Conflicts:
include/chaiscript/dispatchkit/bootstrap_stl.hpp
include/chaiscript/language/chaiscript_parser.hpp
unittests/multithreaded_test.cpp
|
2012-11-16 16:32:39 -07:00 |
|
Jason Turner
|
afd27a4b01
|
Fix errors and warnings found on VisualStudio 2005
|
2012-11-16 12:27:41 -07:00 |
|
Jason Turner
|
c2934caad6
|
Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
include/chaiscript/language/chaiscript_engine.hpp
src/multithreaded.cpp
|
2012-07-13 13:32:29 -06:00 |
|
Jason Turner
|
9f309fcbe9
|
Add tests for multithreaded features #55
|
2012-07-10 15:10:09 -06:00 |
|