Jason Turner 90125d0f9a Merge branch 'master' into 2011-09-09-CxScript ... Conflicts: contrib/geshi/chaiscript.php include/chaiscript/language/chaiscript_common.hpp include/chaiscript/language/chaiscript_eval.hpp include/chaiscript/language/chaiscript_parser.hpp		2012-05-18 09:05:46 -06:00
..
codeanalysis	Update is_prime analysis for new syntax	2011-10-01 11:03:03 -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	Add syntax highlighting for switch/case/default	2012-05-17 13:59:43 -07:00
cupofchai3.svg	Add logo	2009-07-10 12:55:49 +00:00