Jason Turner 66deef52c8 Merge branch 'master' into 2011-09-09-CxScript ...

Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp

2012-06-01 13:46:58 -06:00

..

dispatchkit

Merge branch 'master' into 2011-09-09-CxScript

2012-06-01 13:46:58 -06:00

language

Merge branch 'master' into 2011-09-09-CxScript

2012-05-28 11:42:55 -06:00

utility

Update copyrights to 2012 #23

2012-05-16 11:55:51 -06:00

chaiscript_defines.hpp

Update copyrights to 2012 #23

2012-05-16 11:54:46 -06:00

chaiscript_stdlib.hpp

Update copyrights to 2012 #23

2012-05-16 11:54:46 -06:00

chaiscript_threading.hpp

Update copyrights to 2012 #23

2012-05-16 11:55:51 -06:00

chaiscript.hpp

Update copyrights to 2012 #23

2012-05-16 11:55:51 -06:00