From: Neil Smith <neil.github@njae.me.uk>
Date: Wed, 18 Jul 2012 08:13:18 +0000 (+0100)
Subject: Merge branch 'master' into abstract-erd
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=ff2fd7989c846568bfdfbc3040b731b20b469d5a;p=erd-marker.git

Merge branch 'master' into abstract-erd

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb
---

ff2fd7989c846568bfdfbc3040b731b20b469d5a
diff --cc Gemfile.lock
index 8d44c45,8cec60c..0a4459e
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,9 -2,10 +2,11 @@@ GE
    remote: http://rubygems.org/
    specs:
      diff-lcs (1.1.3)
 -    graph.njae (0.2.3)
 +    graph.njae (0.2.4)
      json (1.6.5)
+     multi_json (1.3.6)
+     porter2stemmer (1.0.0)
 +    porter2stemmer (1.0.1)
      rake (0.9.2.2)
      rdoc (3.12)
        json (~> 1.4)
diff --cc spec/spec_helper.rb
index d10b8b1,d0c7f1a..b54e9f5
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -1,1 -1,10 +1,4 @@@
+ require 'simplecov'
+ SimpleCov.start
+ 
 -require 'rexml/document.rb'
 -include REXML  
 -
 -require 'graph.njae'
 -include GraphNjae
 -
  require 'erd_handler'