# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1314231739 -7200
# Node ID 33cf0231e253b7a9d79c499ac141515016748703
# Parent  d84c4aa2a9eb71bda57fe5bb6ba679c257a31a95# Parent  58bd8e4d5e65ac7177c017377d75f4f6f09d2a86
Merge with d76ad1ff0672265181abb0788c29512bfdc2b0e2

diff -r d84c4aa2a9eb -r 33cf0231e253 web/common.php
--- a/web/common.php	Thu Aug 25 02:20:08 2011 +0200
+++ b/web/common.php	Thu Aug 25 02:22:19 2011 +0200
@@ -115,7 +115,7 @@
 		'jquery-tools' => URL_ROOT.'res/metadataplayer/res/js/jquery.tools.min.js',
 		'tw-widget' => URL_ROOT.'res/js/tw_widget.js',
 		'jquery-mousewheel' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js',
-		'swfobject' => URL_ROOT.'res/metadataplayer/res/swfobject.js',
+		'swfobject' => URL_ROOT.'res/metadataplayer/res/js/swfobject.js',
 	),
 	'cdn' => array(
 	    'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',