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
..
chaiscript Merge branch 'master' into 2011-09-09-CxScript 2012-05-14 10:08:04 -06:00