soundmanager2-rails 2.97.20140901 → 2.97.20150601

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fa203ae43da198f3522bfb330452b7ff5f7c99
-  data.tar.gz: d8b45b115bedec007b8ab53bdc30f121cfe5b882
+  metadata.gz: cababf75db19b53b0719d7dddd18f6f498c4e0cc
+  data.tar.gz: 7e714b30252310ea9f3f0108ded697c4e71a8110
 SHA512:
-  metadata.gz: 1e6d23984c42f588f0caf343fcdcf26aa9809876a4670544343e01c05f431f549c60d4f3f50e4b258805ab960670dcb7a55f0d37119a4f4769b6475be574eff8
-  data.tar.gz: 3d8973bc96199c13cf6094b14f5506897760fdc67fa0ad62b254b2c1133f956cdc8f8bed18383014dc5949eace84b3ecf2ee356d5652395db119617ce6dadf5b
+  metadata.gz: 078a75971ddfe52f5a93b56be2a84e4ab900b6fff85f3c4ef37d95ec0b0d228f5ea8c5474703e8e7ed90af992fb74826a65091013e8040b6480b8cf6fb0741c5
+  data.tar.gz: f65112c0b81e80065c0141ed54ccd4a20021afeff68123cfebf30010108a4845534f8f9d1e993deca2322871a736316a5be0d46810960bb4219e8d3b5404dc78

data/README.md

@@ -43,7 +43,7 @@ You probably want to include some config. I normally have a "settings.html.erb"
     soundManager.consoleOnly = true
 
 
-See the (SoundManager2 docs)[http://www.schillmania.com/projects/soundmanager2/doc/getstarted/] for info about how to initialize and use.
+See the [SoundManager2 docs](http://www.schillmania.com/projects/soundmanager2/doc/getstarted/) for info about how to initialize and use.
 
 ## Important
 
@@ -62,12 +62,8 @@ The current soundmanager2 version at time of this readme is 2.97a.20140901
 In gemfile, you can specify:
 
     # Note: we can't include an "a" in the Minor version, since afaik gems don't support it
-<<<<<<< HEAD
-    gem "soundmanager2-rails", "2.97a.20140901"
-=======
     gem "soundmanager2-rails", "2.97.20140901"
->>>>>>> 3c73f9e6f78fc0daedb64528684f9a154e81fd0e
-    
+
 ### Not up to date?
 
 Send a pull request or bug me on github.

data/VERSION

@@ -1 +1 @@
-2.97.20140901
+2.97.20150601

data/soundmanager2-rails.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: soundmanager2-rails 2.97.20140901 ruby lib
+# stub: soundmanager2-rails 2.97.20150601 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "soundmanager2-rails"
-  s.version = "2.97.20140901"
+  s.version = "2.97.20150601"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Sudara"]
-  s.date = "2014-09-22"
+  s.date = "2016-02-04"
   s.description = "Exposes soundmanager2 as a vendored js lib in rails 3 "
   s.email = "sudara@alonetone.com"
   s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/sudara/soundmanager2-rails"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Exposes soundmanager2 as a vendored js lib in rails 3"
 
   if s.respond_to? :specification_version then