Jason Turner 13ffc92bc3 Merge branch 'master' into 2011-09-09-CxScript ...

Conflicts:
	CMakeLists.txt
	include/chaiscript/dispatchkit/boxed_value.hpp
	include/chaiscript/language/chaiscript_eval.hpp

2012-05-21 10:47:12 -06:00

..

any.hpp

Update copyrights to 2012 #23

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

bad_boxed_cast.hpp

Update copyrights to 2012 #23

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

bind_first.hpp

Update copyrights to 2012 #23

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

bootstrap_stl.hpp

Update copyrights to 2012 #23

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

bootstrap.hpp

Merge branch '2011-09-09-CxScript' of github.com:ChaiScript/ChaiScript into 2011-09-09-CxScript

2012-05-17 10:16:35 -07:00

boxed_cast_helper.hpp

Update copyrights to 2012 #23

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

boxed_cast.hpp

Update copyrights to 2012 #23

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

boxed_number.hpp

Update copyrights to 2012 #23

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

boxed_value.hpp

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

2012-05-21 10:47:12 -06:00

dispatchkit.hpp

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

2012-05-21 10:47:12 -06:00

dynamic_cast_conversion.hpp

Update copyrights to 2012 #23

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

dynamic_object.hpp

Update copyrights to 2012 #23

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

exception_specification.hpp

Update copyrights to 2012 #23

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

function_call_detail.hpp

Update copyrights to 2012 #23

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

function_call.hpp

Move from boost::bind to std::bind

2011-09-10 10:19:55 -06:00

handle_return.hpp

Update copyrights to 2012 #23

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

operators.hpp

Update copyrights to 2012 #23

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

proxy_constructors.hpp

Update copyrights to 2012 #23

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

proxy_functions_detail.hpp

Update copyrights to 2012 #23

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

proxy_functions.hpp

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

2012-05-21 10:47:12 -06:00

register_function.hpp

Update copyrights to 2012 #23

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

type_info.hpp

Update copyrights to 2012 #23

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