merge

Gemfile

@@ -11,7 +11,6 @@ gem "haml", "~> 3.1.0.alpha"
 gem "rcov"
 gem "rubyzip"
 gem "livereload"
-gem "chunky_png", "~> 0.12.0"
 
 gem "ruby-prof" unless RUBY_PLATFORM == "java"
 

Gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: .
+  specs:
+    compass (0.11.beta.3.a4d4319)
+      chunky_png (~> 1.1.0)
+      sass (>= 3.1.0.alpha.249)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    addressable (2.2.4)
+    arel (2.0.9)
+    builder (2.1.2)
+    chunky_png (1.1.0)
+    compass-validator (3.0.0)
+    css_parser (1.0.1)
+    cucumber (0.9.4)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    em-dir-watcher (0.9.4)
+    em-websocket (0.2.1)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    eventmachine (0.12.10)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    haml (3.1.0.alpha.147)
+    i18n (0.5.0)
+    json (1.4.6)
+    livereload (1.6)
+      em-dir-watcher (>= 0.1)
+      em-websocket (>= 0.1.2)
+      ruby-json (>= 1.1.2)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.2)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    ruby-json (1.1.2)
+    ruby-prof (0.9.2)
+    rubyzip (0.9.4)
+    sass (3.1.0.alpha.249)
+    term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.25)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compass!
+  compass-validator (= 3.0.0)
+  css_parser (~> 1.0.1)
+  cucumber (~> 0.9.2)
+  haml (~> 3.1.0.alpha)
+  livereload
+  rails (~> 3.0.0.rc)
+  rcov
+  rspec (~> 2.0.0)
+  ruby-prof
+  rubyzip
+  sass (= 3.1.0.alpha.249)

compass.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gemspec|
   gemspec.summary = %q{A Real Stylesheet Framework}
 
   gemspec.add_dependency 'sass', '>= 3.1.0.alpha.249'
-  gemspec.add_dependency 'chunky_png', '~> 0.12.0'
+  gemspec.add_dependency 'chunky_png', '~> 1.1.0'
 
   gemspec.files = %w(README.markdown LICENSE.markdown VERSION.yml Rakefile)
   gemspec.files += Dir.glob("bin/*")