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 |
|
Jonathan Turner
|
7027f6b834
|
Add syntax highlighting for switch/case/default
|
2012-05-17 13:59:43 -07:00 |
|
Jonathan Turner
|
78f02c375e
|
Add syntax support for switch/case/default.
|
2012-05-17 12:48:57 -07:00 |
|
Jonathan Turner
|
b82895c489
|
Add the 'auto' keyword.
|
2012-05-17 10:31:55 -07:00 |
|
Jonathan Turner
|
7f037b26d4
|
Updated email addresses in copyright information.
|
2010-08-10 05:24:07 +00:00 |
|
Jason Turner
|
65c5178549
|
Update copyright/version info for geshi filter
|
2010-03-31 00:23:02 +00:00 |
|
Jason Turner
|
7fef086cab
|
Add geshi syntax highlighting (updated and cleaned up from the version that was hosted at chaiscript.com)
|
2010-03-30 16:50:18 +00:00 |
|