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
..
2011-09-24 12:05:08 -06:00
2011-09-10 06:55:27 -06:00
2011-09-10 06:55:27 -06:00
2011-09-24 15:21:15 -06:00
2009-07-08 18:59:10 +00:00
2011-09-24 15:21:15 -06:00