Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with c89870738359d3f48fe813a807e78677263d7ddd
authorYves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
Wed, 27 Jul 2011 12:29:02 +0200
changeset 249 b31aef9365a8
parent 248 ffb0a6d08000 (current diff)
parent 241 06f908b0a793 (diff)
child 250 6334869ab06d
Merge with c89870738359d3f48fe813a807e78677263d7ddd
--- a/web/common.php	Wed Jul 27 12:25:45 2011 +0200
+++ b/web/common.php	Wed Jul 27 12:29:02 2011 +0200
@@ -114,7 +114,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' => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js',
+		'swfobject' => URL_ROOT.'res/metadataplayer/res/swfobject.js',
 	),
 	'cdn' => array(
 	    'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
@@ -153,7 +153,7 @@
 		'blueprint-plugins-fancy-type' => URL_ROOT.'res/blueprint/plugins/fancy-type/screen.css',
 		'custom' => URL_ROOT.'res/css/custom.css',
 		'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css',
-		'jquery-ui' => "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css",
+		'jquery-ui' => URL_ROOT.'res/metadataplayer/res/css/jq-css/themes/base/jquery-ui.css',
 		'tabs-slideshow' => URL_ROOT.'res/css/tabs-slideshow.css',
 	),
 	'cdn' => array(
tweet_live