Jason Turner 286b130f47 Merge branch 'master' into 2011-09-09-CxScript
Conflicts:
	CMakeLists.txt
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/language/chaiscript_engine.hpp
2012-05-14 10:08:04 -06:00
..
dispatchkit Merge branch 'master' into 2011-09-09-CxScript 2012-05-14 10:08:04 -06:00
language Merge branch 'master' into 2011-09-09-CxScript 2012-05-14 10:08:04 -06:00
utility Remove boost from utility and associated module tests 2011-09-21 00:04:15 -06:00
chaiscript_defines.hpp Boost eradicated from ChaiScript 2011-09-21 08:36:46 -06:00
chaiscript_stdlib.hpp Add missing chaiscript_stdlib.hpp file 2012-01-30 09:05:21 -07:00
chaiscript_threading.hpp Update for C++11 features 2011-09-21 10:01:21 -06:00
chaiscript.hpp Merge branch 'master' into 2011-09-09-CxScript 2012-05-14 10:08:04 -06:00