Skip to content

Commit 39517be

Browse files
nathanynathany
committed
Merge branch 'master' into lua-scanner
2 parents 2b16d11 + 5f54b36 commit 39517be

File tree

123 files changed

+32
-40757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+32
-40757
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ bench/test.div.html
2222
diff.html
2323
etc/CodeRay.tmproj
2424
*.swp
25+
etc

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ rvm:
66
- jruby-19mode
77
- rbx-18mode
88
# - rbx-19mode # test again later
9-
- ruby-head
10-
- jruby-head
9+
# - ruby-head # test again later
10+
# - jruby-head # test again later
1111
- ree
1212
branches:
1313
only:

‎Changes.textile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
44

55
{{toc}}
66

7+
h2. Next Version
8+
9+
* add @:string/:char@, remove @:regexp/:function@ color from Terminal encoder [GH #29, thanks to Kyrylo Silin]
10+
711
h2. Changes in 1.0.7
812

13+
* Changed license from LGPL to MIT. [GH-25, thanks to jessehu]
914
* Fix issue with plugin files not being loaded. [GH-20, thanks to Will Read]
1015
* Fix HTML scanner bug: Don't choke on boolean attributes. [GH-26, thanks to jugglinmike]
1116

‎LICENSE

Lines changed: 0 additions & 504 deletions
This file was deleted.

‎MIT-LICENSE.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (C) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de> (@murphy_karasu)
2+
3+
http://coderay.rubychan.de/
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the
7+
"Software"), to deal in the Software without restriction, including
8+
without limitation the rights to use, copy, modify, merge, publish,
9+
distribute, sublicense, and/or sell copies of the Software, and to
10+
permit persons to whom the Software is furnished to do so, subject to
11+
the following conditions:
12+
13+
The above copyright notice and this permission notice shall be
14+
included in all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎etc/ansi-color/256colors2.pl

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎etc/ansi-color/colortable16.sh

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎etc/check-coderay-gem-stats.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎etc/check-diffs.rb

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎etc/coderay-complete.tmproj

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎etc/coderay-lib.tmproj

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)