Merge remote-tracking branch 'upstream/pull/1576'

[rails.git] / Vendorfile

diff --git a/Vendorfile b/Vendorfile
index ac361e575f65bc7729e26c19e874aa54adcdb124..8ca4342d75fffd1cbd61775dd3b806f24990166e 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -55,6 +55,7 @@ folder 'vendor/assets' do
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/mapillary-js', 'dist/mapillary-js'
+      folder 'iD/pannellum-streetside', 'dist/pannellum-streetside'
 
       file 'iD.css.erb', 'dist/iD.css' do |path|
         rewrite(path) do |content|
@@ -70,4 +71,11 @@ folder 'vendor/assets' do
     file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'
     file 'bowser.js', 'https://github.com/lancedikson/bowser/releases/download/1.9.3/bowser.js'
   end
+
+  folder 'swfobject' do
+    from 'git://github.com/swfobject/swfobject.git', :tag => '2.2' do
+      file 'expressInstall.swf', 'swfobject/expressInstall.swf'
+      file 'swfobject.js', 'swfobject/src/swfobject.js'
+    end
+  end
 end