Merge branch 'dbalatero-fix192'

Conflicts: Gemfile.lock
kslazarev · Dec 17, 2010 · 7016ab9 · 7016ab9
2 parents bf09a06 + 878ac67
commit 7016ab9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,10 +8,10 @@ gem "stringex"
 gem "open4"
 gem "json"
 
-#xmpp notifications
-gem "xmpp4r-simple"
+# ruby 1.9 compatible version
+gem "scashin133-xmpp4r-simple", '0.8.9', :require => 'xmpp4r-simple'
 
-#irc notification
+# irc notification
 gem "shout-bot"
 
 # campfire notifications

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -122,6 +122,8 @@ GEM
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
+    scashin133-xmpp4r-simple (0.8.9)
+      xmpp4r (>= 0.3.2)
     selenium-webdriver (0.1.0)
       childprocess (= 0.1.4)
       ffi (~> 0.6.3)
@@ -146,8 +148,6 @@ GEM
       roauth (>= 0.0.2)
     tzinfo (0.3.23)
     xmpp4r (0.5)
-    xmpp4r-simple (0.8.8)
-      xmpp4r (>= 0.3.2)
     xpath (0.1.2)
       nokogiri (~> 1.3)
 
@@ -170,8 +170,8 @@ DEPENDENCIES
   rails (= 3.0.3)
   ruby-debug
   ruby-debug19
+  scashin133-xmpp4r-simple (= 0.8.9)
   shout-bot
   sqlite3-ruby
   stringex
   tinder
-  xmpp4r-simple