diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
| commit | 2afe23ab0a3d17b50f55750241a682403ced4fc8 (patch) | |
| tree | 19708f1d79ce22eed6b0e90de4760a8cfcc9504b /coderay.gemspec | |
| parent | c044a7a6eaba9ba47b8fde2cd6bdd444d8f87062 (diff) | |
| parent | 9c3837e0086ca07f241e9cc74c9fabbeb2d39987 (diff) | |
| download | coderay-2afe23ab0a3d17b50f55750241a682403ced4fc8.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Conflicts:
coderay.gemspec
Diffstat (limited to 'coderay.gemspec')
| -rw-r--r-- | coderay.gemspec | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coderay.gemspec b/coderay.gemspec index d9e1bb8..f30f5fe 100644 --- a/coderay.gemspec +++ b/coderay.gemspec @@ -9,8 +9,10 @@ Gem::Specification.new do |s| 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" + # revision = 134 + (`git log --oneline | wc -l`.to_i) + # s.version = "#{CodeRay::VERSION}.#{revision}rc1" + s.version = "#{CodeRay::VERSION}.rc1" +>>>>>>> master end s.authors = ['Kornelius Kalnbach'] |