Merge branch 'master' into hidden-773347

mozilla · Aug 2, 2012 · 6d682b7 · 6d682b7
2 parents 44fb4ce + 0ba06fd
commit 6d682b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mozilla/build/module-prefix.jsm b/mozilla/build/module-prefix.jsm
@@ -26,7 +26,7 @@
 
 var EXPORTED_SYMBOLS = [ "{EXPORTED_SYMBOLS}" ];
 
-Components.utils.import("resource:///modules/devtools/Require.jsm");
-Components.utils.import("resource:///modules/devtools/Console.jsm");
+Components.utils.import("resource://gre/modules/devtools/Require.jsm");
+Components.utils.import("resource://gre/modules/devtools/Console.jsm");
 Components.utils.import("resource:///modules/devtools/Browser.jsm");
 
diff --git a/mozilla/build/prefix-test.js b/mozilla/build/prefix-test.js
@@ -54,13 +54,13 @@
 
 let [ define, require ] = (function() {
   let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Require.jsm", tempScope);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
   return [ tempScope.define, tempScope.require ];
 })();
 
 let console = (function() {
   let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Console.jsm", tempScope);
+  Components.utils.import("resource://gre/modules/devtools/Console.jsm", tempScope);
   return console;
 })();