Jason Turner 926e962fc0 Merge remote-tracking branch 'origin/release-4.x' ...

Conflicts:
	.travis.yml
	CMakeLists.txt
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/boxed_cast.hpp
	include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
	include/chaiscript/dispatchkit/function_call_detail.hpp
	include/chaiscript/dispatchkit/proxy_functions.hpp
	include/chaiscript/language/chaiscript_common.hpp

2014-03-29 07:30:14 -06:00

..

codeanalysis

Merge remote-tracking branch 'origin/release-4.x'

2014-03-29 07:30:14 -06:00

geshi

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

2012-05-18 09:05:46 -06:00

pkgconfig

Apply patch (and rearrange a directory) from emarcotte for pkgconfig support

2010-11-08 13:47:41 +00:00

vim

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

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

cupofchai3.svg

Add logo

2009-07-10 12:55:49 +00:00