Skip to content

Commit 1f88ad0

Browse files
kornykorny
committed
Merge branch 'master' into multiline-inline-diff
2 parents 5c5954d + 9ede776 commit 1f88ad0

File tree

119 files changed

+8
-40247
lines changed

Some content is hidden

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

119 files changed

+8
-40247
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ 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

913
* Changed license from LGPL to MIT. [GH-25, thanks to jessehu]

‎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)