diff options
| author | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
| commit | 0f8ac4e8c5872a6b68b350f96a9ecde0291edefa (patch) | |
| tree | ad7938bb4143d5e5a38fd7a8d131e4171aec657d /inc/geshi/apache.php | |
| parent | 58ec8fa9128e4581749955de87530f432e387588 (diff) | |
| parent | b31fcef02fd24b3e746c9618e77152c7b84c2f2a (diff) | |
| download | rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.gz rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/geshi/apache.php')
| -rw-r--r-- | inc/geshi/apache.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/geshi/apache.php b/inc/geshi/apache.php index 34704eb22..c944443c7 100644 --- a/inc/geshi/apache.php +++ b/inc/geshi/apache.php @@ -4,7 +4,7 @@ * ---------- * Author: Tux (tux@inmail.cz) * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter) - * Release Version: 1.0.8.8 + * Release Version: 1.0.8.11 * Date Started: 2004/29/07 * * Apache language file for GeSHi. @@ -344,6 +344,9 @@ $language_data = array ( //mod_unique_id.c + //mod_upload_progress + 'ReportUploads', 'TrackUploads', 'UploadProgressSharedMemorySize', + //mod_userdir.c 'UserDir', |