diff options
author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
tree | c8d0f78c2f47f373473419396d3c0855ec671eca /inc/geshi/powershell.php | |
parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'inc/geshi/powershell.php')
-rw-r--r-- | inc/geshi/powershell.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/geshi/powershell.php b/inc/geshi/powershell.php index e427059d3..c90538809 100644 --- a/inc/geshi/powershell.php +++ b/inc/geshi/powershell.php @@ -4,7 +4,7 @@ * --------------------------------- * Author: Frode Aarebrot (frode@aarebrot.net) * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net) - * Release Version: 1.0.8.4 + * Release Version: 1.0.8.8 * Date Started: 2008/06/20 * * PowerShell language file for GeSHi. @@ -49,7 +49,7 @@ $language_data = array ( 'LANG_NAME' => 'PowerShell', 'COMMENT_SINGLE' => array(1 => '#'), - 'COMMENT_MULTI' => array(), + 'COMMENT_MULTI' => array('<#' => '#>'), 'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE, 'QUOTEMARKS' => array("'", '"'), 'ESCAPE_CHAR' => '`', |