From 7fa8d4d258b55ec990ae365b6b7a17d3fa1c9d20 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 16 Dec 2011 09:11:21 +0000
Subject: [PATCH] Bug 692625 - Move browser/components/sidebar/src/ to
 browser/components/sidebar/; r=gavin

--HG--
rename : browser/components/sidebar/src/Makefile.in => browser/components/sidebar/Makefile.in
rename : browser/components/sidebar/src/nsSidebar.js => browser/components/sidebar/nsSidebar.js
rename : browser/components/sidebar/src/nsSidebar.manifest => browser/components/sidebar/nsSidebar.manifest
---
 browser/components/Makefile.in                          | 2 +-
 browser/components/sidebar/{src => }/Makefile.in        | 2 +-
 browser/components/sidebar/{src => }/nsSidebar.js       | 0
 browser/components/sidebar/{src => }/nsSidebar.manifest | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename browser/components/sidebar/{src => }/Makefile.in (98%)
 rename browser/components/sidebar/{src => }/nsSidebar.js (100%)
 rename browser/components/sidebar/{src => }/nsSidebar.manifest (100%)

diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index 38069b1f8c7c..89ca9e85733b 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -69,7 +69,7 @@ PARALLEL_DIRS = \
   search \
   sessionstore \
   shell \
-  sidebar/src \
+  sidebar \
   tabview \
   migration \
   $(NULL)
diff --git a/browser/components/sidebar/src/Makefile.in b/browser/components/sidebar/Makefile.in
similarity index 98%
rename from browser/components/sidebar/src/Makefile.in
rename to browser/components/sidebar/Makefile.in
index b4ef556d9aa9..e93a8f368b89 100644
--- a/browser/components/sidebar/src/Makefile.in
+++ b/browser/components/sidebar/Makefile.in
@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
diff --git a/browser/components/sidebar/src/nsSidebar.js b/browser/components/sidebar/nsSidebar.js
similarity index 100%
rename from browser/components/sidebar/src/nsSidebar.js
rename to browser/components/sidebar/nsSidebar.js
diff --git a/browser/components/sidebar/src/nsSidebar.manifest b/browser/components/sidebar/nsSidebar.manifest
similarity index 100%
rename from browser/components/sidebar/src/nsSidebar.manifest
rename to browser/components/sidebar/nsSidebar.manifest