Jason Turner e86fc96b2f Merge branch 'AddMoreWarningFlags' into develop
Conflicts:
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_eval.hpp
2015-01-16 19:32:53 -07:00
..
dispatchkit Merge branch 'AddMoreWarningFlags' into develop 2015-01-16 19:32:53 -07:00
language Merge branch 'AddMoreWarningFlags' into develop 2015-01-16 19:32:53 -07:00
utility Modernization of chaiscript_parser 2014-10-04 09:37:33 -06:00
chaiscript_defines.hpp Tick version up to 5.5.1 2014-12-21 13:12:56 -07:00
chaiscript_stdlib.hpp Add future support, and fix returning of r-values 2015-01-06 15:31:06 -07:00
chaiscript_threading.hpp Fix issues found with cppcheck inconclusive 2015-01-16 10:10:14 -07:00
chaiscript.hpp Merge branch 'develop' of https://github.com/ChaiScript/ChaiScript into develop 2014-09-08 11:11:35 -06:00