rubychan
diff --git a/‎.gitignore
+1 b/‎.gitignore
+1
diff --git a/‎.travis.yml
+2-3 b/‎.travis.yml
+2-3
diff --git a/‎Changes.textile
+7 b/‎Changes.textile
+7
diff --git a/‎Gemfile
+1-1 b/‎Gemfile
+1-1
diff --git a/‎LICENSE
-504 b/‎LICENSE
-504
diff --git a/‎MIT-LICENSE.txt
+22 b/‎MIT-LICENSE.txt
+22
diff --git a/‎coderay.gemspec
+1-4 b/‎coderay.gemspec
+1-4
diff --git a/‎etc/ansi-color/256colors2.pl
-63 b/‎etc/ansi-color/256colors2.pl
-63
diff --git a/‎etc/ansi-color/colortable16.sh
-48 b/‎etc/ansi-color/colortable16.sh
-48
diff --git a/‎etc/check-coderay-gem-stats.sh
-1 b/‎etc/check-coderay-gem-stats.sh
-1
diff --git a/‎etc/check-diffs.rb
-27 b/‎etc/check-diffs.rb
-27
diff --git a/‎etc/coderay-complete.tmproj
-27 b/‎etc/coderay-complete.tmproj
-27
@@ -22,3 +22,4 @@ bench/test.div.html
 diff.html
 etc/CodeRay.tmproj
 *.swp
+etc
@@ -5,12 +5,11 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
-  # - rbx-19mode  # test again later
-  - ruby-head
+  - rbx-19mode
+  # - ruby-head  # test again later: RedCloth not compiling
   - jruby-head
   - ree
 branches:
   only:
     - master
-    - stable
 script: "rake test" # test:scanners"
@@ -4,8 +4,15 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
 
 {{toc}}
 
+h2. Next Version
+ 
+* add @:string/:char@, remove @:regexp/:function@ color from Terminal encoder [GH #29, thanks to Kyrylo Silin]
+* allow @-@ in line number anchor prefix for HTML encoder [GH #32, thanks to shurizzle]
+* Fix HTML scanner: Don't crash if HTML in a diff contains a JavaScript tag.
+
 h2. Changes in 1.0.7
 
+* Changed license from LGPL to MIT. [GH-25, thanks to jessehu]
 * Fix issue with plugin files not being loaded. [GH-20, thanks to Will Read]
 * Fix HTML scanner bug: Don't choke on boolean attributes. [GH-26, thanks to jugglinmike]
 
 
@@ -8,7 +8,7 @@ gemspec
 group :development do
   gem "bundler", ">= 1.0.0"
   gem "rake", "~> 0.9.2"
-  gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : ">= 4.0.3"
+  gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3"
   gem "term-ansicolor"
   gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7'
   gem "json" unless RUBY_VERSION >= '1.9.1'
 
@@ -0,0 +1,22 @@
+Copyright (C) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de> (@murphy_karasu)
+
+http://coderay.rubychan.de/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -8,10 +8,7 @@ Gem::Specification.new do |s|
   if ENV['RELEASE']
     s.version = CodeRay::VERSION
   else
-    # thanks to @Argorak for this solution
-    # revision = 134 + (`git log --oneline | wc -l`.to_i)
-    # s.version = "#{CodeRay::VERSION}.#{revision}rc1"
-    s.version = "#{CodeRay::VERSION}.rc2"
+    s.version = "#{CodeRay::VERSION}.rc#{ENV['RC'] || 1}"
   end
 
   s.authors     = ['Kornelius Kalnbach']