From 1fd78bf602ca3b3af3be9bd00a782ddf6575a9df Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Thu, 29 Oct 2015 19:09:39 +0200
Subject: [PATCH] update salaam

---
 Gemfile      |  5 +++--
 Gemfile.lock | 17 ++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5cb7e0a..b525f3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,11 @@ source 'https://rubygems.org'
 
 gem "opal" , :github => "opal/opal"
 gem 'opal-browser'
+#gem "ast" , :path => "../ast"
 gem "ast" , :github => "whitequark/ast"
 
-#gem "salama" , "0.3" , :path => "../salama"
-gem "salama" , github: "salama/salama"
+gem "salama" , "0.3" , :path => "../salama"
+#gem "salama" , github: "salama/salama"
 
 gem "parslet"
 gem "salama-reader" , github: "salama/salama-reader"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5be210f..22a83c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,20 +28,19 @@ GIT
       ast (~> 2.1.0)
       parslet (~> 1.7.0)
 
-GIT
-  remote: git://github.com/salama/salama.git
-  revision: 79cf59c4e24dabaa4fc114a2dee4536b8c55e2a6
-  specs:
-    salama (0.3.0)
-      salama-object-file (~> 0.3)
-      salama-reader (~> 0.3)
-
 GIT
   remote: git://github.com/whitequark/ast.git
   revision: 3814fb102af82a30bf334005ebe17332744f9dad
   specs:
     ast (2.1.0)
 
+PATH
+  remote: ../salama
+  specs:
+    salama (0.3.0)
+      salama-object-file (~> 0.3)
+      salama-reader (~> 0.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -129,7 +128,7 @@ DEPENDENCIES
   parslet
   poltergeist (~> 1.5.0)
   rspec (~> 3.2.0)
-  salama!
+  salama (= 0.3)!
   salama-arm!
   salama-object-file!
   salama-reader!