Jason Turner bacf546dff Merge branch 'develop' into remove_std_function
Conflicts:
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
2015-06-02 16:16:22 -06:00
..
dispatchkit Merge branch 'develop' into remove_std_function 2015-06-02 16:16:22 -06:00
language Move prelude into stdlib so it's not included everywhere 2015-05-23 16:16:39 -06:00
utility Code simplifications and spelling fixes found by clion 2015-04-27 08:09:31 -06:00
chaiscript_defines.hpp g++4.6 correction 2015-06-01 16:08:04 -06:00
chaiscript_stdlib.hpp Move prelude into stdlib so it's not included everywhere 2015-05-23 16:16:39 -06:00
chaiscript_threading.hpp Reduce copies of UDTs 2015-04-07 10:23:43 -06:00
chaiscript.hpp Merge branch 'master' into develop 2015-03-13 22:28:24 -06:00