diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
| commit | 5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8 (patch) | |
| tree | 9e74edadd344247e805f6bd3588a34fdf0dbfa21 /lib/coderay.rb | |
| parent | 69246fc8ed0344eae4dab35286813a00010a08cb (diff) | |
| parent | 2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff) | |
| download | coderay-5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8.tar.gz | |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/styles/alpha.rb
lib/coderay/token_kinds.rb
Diffstat (limited to 'lib/coderay.rb')
| -rw-r--r-- | lib/coderay.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/coderay.rb b/lib/coderay.rb index 88c7cc2..24ae5a2 100644 --- a/lib/coderay.rb +++ b/lib/coderay.rb @@ -166,7 +166,6 @@ module CodeRay # # See also demo/demo_simple. def scan code, lang, options = {}, &block - # FIXME: return a proxy for direct-stream encoding TokensProxy.new code, lang, options, block end |