aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Helmkamp <bryan@brynary.com>2009-10-19 22:06:51 -0400
committerBryan Helmkamp <bryan@brynary.com>2009-10-19 22:06:51 -0400
commit5b4c964104f3cfd08500b37a14e220219e695aee (patch)
treee01ab4bd4ca3970f2b69df29ba7d7d14e6eaf69b
parent6d093fb719f4f080d47c8aeadb72201979c604d7 (diff)
parent35acdc90ec31d386c49b29a5db9c867db137e6ea (diff)
downloadrails-5b4c964104f3cfd08500b37a14e220219e695aee.tar.gz
rails-5b4c964104f3cfd08500b37a14e220219e695aee.tar.bz2
rails-5b4c964104f3cfd08500b37a14e220219e695aee.zip
Merge branch 'rails/master'
-rw-r--r--VERSION2
-rw-r--r--arel.gemspec3
2 files changed, 2 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 6c6aa7cb09..17e51c385e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.0 \ No newline at end of file
+0.1.1
diff --git a/arel.gemspec b/arel.gemspec
index 003a38073a..6801267b63 100644
--- a/arel.gemspec
+++ b/arel.gemspec
@@ -5,7 +5,7 @@
Gem::Specification.new do |s|
s.name = %q{arel}
- s.version = "0.1.0"
+ s.version = "0.1.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Bryan Helmkamp", "Nick Kallen"]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
"doc/CONVENTIONS",
"doc/TODO",
"lib/arel.rb",
- "lib/arel/.DS_Store",
"lib/arel/algebra.rb",
"lib/arel/algebra/extensions.rb",
"lib/arel/algebra/extensions/class.rb",