point to master

rmm5t · Jan 31, 2012 · b5d9d14 · b5d9d14
1 parent 8851e29
commit b5d9d14
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :assets do
-  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => 'no_rails_integration'
+  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => :master
   gem 'compass-rails', :path => '.'
 end
 

diff --git a/gemfiles/rails2.gemfile b/gemfiles/rails2.gemfile
@@ -9,7 +9,7 @@ gem "guard-test"
 gem "rails", "2.3.14"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>"no_rails_integration"
+  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
   gem "compass-rails", :path=>".."
 end
 group :test do

diff --git a/gemfiles/rails2.gemfile.lock b/gemfiles/rails2.gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/chriseppstein/compass.git
-  revision: 0e74efb13e17b2c10fcbc9113d383787b0dbb965
-  branch: no_rails_integration
+  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
+  branch: master
   specs:
-    compass (0.12.rc.4.0e74efb)
+    compass (0.12.rc.4.addbc94)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)

diff --git a/gemfiles/rails3.gemfile b/gemfiles/rails3.gemfile
@@ -9,7 +9,7 @@ gem "guard-test"
 gem "rails", "3.0.11"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>"no_rails_integration"
+  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
   gem "compass-rails", :path=>".."
 end
 group :test do

diff --git a/gemfiles/rails3.gemfile.lock b/gemfiles/rails3.gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/chriseppstein/compass.git
-  revision: 0e74efb13e17b2c10fcbc9113d383787b0dbb965
-  branch: no_rails_integration
+  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
+  branch: master
   specs:
-    compass (0.12.rc.4.0e74efb)
+    compass (0.12.rc.4.addbc94)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)

diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -10,7 +10,7 @@ gem "rails", "3.1.3"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>"no_rails_integration"
+  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
   gem "compass-rails", :path=>".."
 end
 group :test do

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/chriseppstein/compass.git
-  revision: 0e74efb13e17b2c10fcbc9113d383787b0dbb965
-  branch: no_rails_integration
+  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
+  branch: master
   specs:
-    compass (0.12.rc.4.0e74efb)
+    compass (0.12.rc.4.addbc94)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)

diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -10,7 +10,7 @@ gem "rails", "~> 3.2"
 gem "sass-rails"
 
 group :assets do
-  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>"no_rails_integration"
+  gem "compass", :git=>"git://github.com/chriseppstein/compass.git", :branch=>:master
   gem "compass-rails", :path=>".."
 end
 group :test do

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/chriseppstein/compass.git
-  revision: 0e74efb13e17b2c10fcbc9113d383787b0dbb965
-  branch: no_rails_integration
+  revision: addbc94716e95a7e6f200baa980b48c7e7a1a568
+  branch: master
   specs:
-    compass (0.12.rc.4.0e74efb)
+    compass (0.12.rc.4.addbc94)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)