From 76a698f028b55029502b94663cee4175ffe8b6ba Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Tue, 27 Oct 2015 12:46:39 +0200
Subject: [PATCH] update salaam

---
 Gemfile.lock            | 4 ++--
 assets/css/app.css.scss | 2 +-
 config.ru               | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ac17656..6d1ead1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,7 +16,7 @@ GIT
 
 GIT
   remote: git://github.com/salama/salama-arm.git
-  revision: 4fd8d6fa93f5abcee5d960da9e2b2ec968ba3ea0
+  revision: 9b011ee365ea0312568ba858662023747154c59f
   specs:
     salama-arm (0.3.0)
 
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/salama/salama.git
-  revision: c68577c3f4b77be495a9d4e161171356a611730f
+  revision: fdc7f8b39ce560506cd039805ccdb499cc4b31fa
   specs:
     salama (0.3.0)
       salama-object-file (~> 0.3)
diff --git a/assets/css/app.css.scss b/assets/css/app.css.scss
index c4ebb15..4390970 100644
--- a/assets/css/app.css.scss
+++ b/assets/css/app.css.scss
@@ -24,7 +24,7 @@ $susy: (
 
 .source_view { @include span(8); }
 
-.block_view {
+.label_view {
   @include span(3);
   margin-right: span(1);
   height: 200px;
diff --git a/config.ru b/config.ru
index ee7300c..22df139 100644
--- a/config.ru
+++ b/config.ru
@@ -2,15 +2,13 @@ require 'bundler'
 Bundler.require
 require 'tilt/erb'
 
-require_relative "lib/parse_task"
-
 require "opal"
 require 'opal-browser'
 
 Opal.use_gem("salama")
 Opal.use_gem("ast")
 Opal.use_gem("salama-arm")
-Virtual.machine.boot
+Register.machine.boot
 
 class DebugServer < Opal::Server
   def call(env)