From 1a1cfb9c65518ac3b56f792065edb06b5cbd2b0d Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Tue, 14 Jun 2011 17:44:02 +0000
Subject: [PATCH] Remove redundant mediawiki.util directory

---
 resources/Resources.php                                       | 2 +-
 resources/{mediawiki.util => mediawiki}/mediawiki.util.js     | 0
 tests/qunit/index.html                                        | 4 ++--
 .../resources/{mediawiki.util => mediawiki}/mediawiki.util.js | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename resources/{mediawiki.util => mediawiki}/mediawiki.util.js (100%)
 rename tests/qunit/suites/resources/{mediawiki.util => mediawiki}/mediawiki.util.js (100%)

diff --git a/resources/Resources.php b/resources/Resources.php
index 2469b75329..ce6e365039 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -446,7 +446,7 @@ return array(
 		),
 	),
 	'mediawiki.util' => array(
-		'scripts' => 'resources/mediawiki.util/mediawiki.util.js',
+		'scripts' => 'resources/mediawiki/mediawiki.util.js',
 		'dependencies' => array(
 			'jquery.checkboxShiftClick',
 			'jquery.client',
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
similarity index 100%
rename from resources/mediawiki.util/mediawiki.util.js
rename to resources/mediawiki/mediawiki.util.js
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index 60d89205bf..17eb3dd81f 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -25,7 +25,7 @@
 		<script src="../../resources/jquery/jquery.makeCollapsible.js"></script>
 		<script src="../../resources/jquery/jquery.mwPrototypes.js"></script>
 		<script src="../../resources/jquery/jquery.placeholder.js"></script>
-	<script src="../../resources/mediawiki.util/mediawiki.util.js"></script>
+	<script src="../../resources/mediawiki/mediawiki.util.js"></script>
 
 	<!-- MW: user.options -->
 	<script>
@@ -47,7 +47,7 @@
 
 	<script src="suites/resources/jquery/jquery.client.js"></script>
 	<script src="suites/resources/jquery/jquery.mwPrototypes.js"></script>
-	<script src="suites/resources/mediawiki.util/mediawiki.util.js"></script>
+	<script src="suites/resources/mediawiki/mediawiki.util.js"></script>
 
 	<script src="suites/resources/jquery/jquery.autoEllipsis.js"></script>
 	<script src="suites/resources/jquery/jquery.colorUtil.js"></script>
diff --git a/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.js
similarity index 100%
rename from tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
rename to tests/qunit/suites/resources/mediawiki/mediawiki.util.js
-- 
2.20.1