diff options
| author | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-01-23 20:33:32 +0100 |
| commit | fc756e0d4d88b37c01a9155e675a549430b00593 (patch) | |
| tree | 7adc185d2c349788961ff7cb8f9bcb25afbce485 /inc/parser/lexer.php | |
| parent | 8605afb1b4e2a6a9e11e21a7bf0775bbb0d5af03 (diff) | |
| parent | 820923f1328bcfe6002831570eb65238411c5b70 (diff) | |
| download | rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.gz rpg-fc756e0d4d88b37c01a9155e675a549430b00593.tar.bz2 | |
Merge branch 'master' into indexer_improvements
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'inc/parser/lexer.php')
| -rw-r--r-- | inc/parser/lexer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php index 211945d8f..b5bcb9612 100644 --- a/inc/parser/lexer.php +++ b/inc/parser/lexer.php @@ -597,4 +597,4 @@ function Doku_Lexer_Escape($str) { return preg_replace($chars, $escaped, $str); } -//Setup VIM: ex: et ts=4 sw=4 enc=utf-8 : +//Setup VIM: ex: et ts=4 sw=4 : |