From 0d029e6a02c3d7cf577df40f6974f4db8c40fdfc Mon Sep 17 00:00:00 2001
From: Scott Davis <jetviper21@gmail.com>
Date: Sun, 24 Apr 2011 23:23:07 -0400
Subject: [PATCH] merge

---
 Gemfile              | 6 +++++-
 Gemfile.lock         | 8 ++++++--
 doc-src/Gemfile      | 1 +
 doc-src/Gemfile.lock | 6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index ead7dac2..b102fdf4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source :rubygems
 
 gemspec
 
-#gem "compass", :path => "." #no idea but it fixed my rage - sdavis
 gem "cucumber", "~> 0.9.2"
 gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
@@ -17,7 +16,12 @@ gem "rb-fsevent"
 
 gem "ruby-prof" unless RUBY_PLATFORM == "java"
 
+
 gem 'autotest'
+gem 'autotest-fsevent'
 gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
 gem 'mocha'
 gem 'timecop'
+
+
+
diff --git a/Gemfile.lock b/Gemfile.lock
index f329954b..4f3fe2a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    compass (0.11.beta.7.a997fa2)
+    compass (0.11.beta.7.5962a85)
       chunky_png (~> 1.1.1)
       fssm (>= 0.2.7)
       sass (>= 3.1.0.alpha.249)
@@ -47,6 +47,8 @@ GEM
     arel (2.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
+    autotest-fsevent (0.2.5)
+      sys-uname
     builder (2.1.2)
     chunky_png (1.1.1)
     compass-validator (3.0.0)
@@ -69,7 +71,7 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-    haml (3.1.0.alpha.147)
+    haml (3.1.0)
     i18n (0.5.0)
     json (1.4.6)
     livereload (1.6)
@@ -119,6 +121,7 @@ GEM
     ruby-prof (0.10.5)
     rubyzip (0.9.4)
     sass (3.1.0.alpha.263)
+    sys-uname (0.8.5)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     timecop (0.3.5)
@@ -131,6 +134,7 @@ PLATFORMS
 
 DEPENDENCIES
   autotest
+  autotest-fsevent
   compass!
   compass-validator (= 3.0.0)
   css_parser (~> 1.0.1)
diff --git a/doc-src/Gemfile b/doc-src/Gemfile
index 1b09d7ac..02cd4b7f 100644
--- a/doc-src/Gemfile
+++ b/doc-src/Gemfile
@@ -19,3 +19,4 @@ gem 'css_parser', "1.0.1"
 gem 'ruby-prof'
 gem 'rb-fsevent'
 
+
diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock
index 46916319..f489eada 100644
--- a/doc-src/Gemfile.lock
+++ b/doc-src/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
 PATH
   remote: ..
   specs:
-    compass (0.11.beta.7.f4ac295)
-      chunky_png (~> 1.1.0)
+    compass (0.11.beta.7.5962a85)
+      chunky_png (~> 1.1.1)
       fssm (>= 0.2.7)
       sass (>= 3.1.0.alpha.249)
 
@@ -17,7 +17,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.5)
-    chunky_png (1.1.0)
+    chunky_png (1.1.1)
     coderay (0.9.7)
     compass-susy-plugin (0.9.beta.3)
       compass (>= 0.11.beta.3)