Jason Turner dd79534de1 Merge branch 'master' into ChaiScript_5_0_CPP_11 ...

Conflicts:
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_parser.hpp

2013-02-23 21:37:50 -07:00

..

codeanalysis

Merge branch 'master' into ChaiScript_5_0_CPP_11

2013-02-23 21:37:50 -07: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