Jason Turner b615d2a423 Merge branch 'master' into 2011-09-09-CxScript ... Conflicts: include/chaiscript/language/chaiscript_eval.hpp		2012-01-30 09:10:43 -07:00
..
chaiscript_algebraic.hpp	Boost eradicated from ChaiScript	2011-09-21 08:36:46 -06:00
chaiscript_common.hpp	Reduce cost of including chaiscript.hpp	2011-12-27 21:37:00 -07:00
chaiscript_engine.hpp	Reduce cost of including chaiscript.hpp	2011-12-27 21:37:00 -07:00
chaiscript_eval.hpp	Merge branch 'master' into 2011-09-09-CxScript	2012-01-30 09:10:43 -07:00
chaiscript_parser.hpp	Merge branch '2011-09-09-CxScript' of https://github.com/ChaiScript/ChaiScript into 2011-09-09-CxScript	2011-10-01 10:24:48 -06:00
chaiscript_prelude_docs.hpp	Finalize documentation for 3.0.0 release and update version number in CMakeLists.txt	2011-05-20 13:44:34 -06:00
chaiscript_prelude.hpp	Fixed parsing of block statements vs initializer expressions.	2011-10-01 10:19:45 -06:00