summaryrefslogtreecommitdiff
path: root/common/chrome.manifest
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2012-05-07 17:01:21 -0400
committerKris Maglione <maglione.k@gmail.com>2012-05-07 17:01:21 -0400
commit43f329512727ccc6d0da2193f5eead5ae0d6d705 (patch)
tree979f4bc2853af23265f9ff2b0e19b036f1277c3f /common/chrome.manifest
parent461b26c603e53fb11459202e35b87ab610884d95 (diff)
downloadpentadactyl-43f329512727ccc6d0da2193f5eead5ae0d6d705.tar.gz
Merge addon-common module loading code to fix Minefield.
--HG-- extra : rebase_source : 6b5f0dc0a575a6d21892e18cbb56ab0230382356
Diffstat (limited to 'common/chrome.manifest')
-rw-r--r--common/chrome.manifest12
1 files changed, 6 insertions, 6 deletions
diff --git a/common/chrome.manifest b/common/chrome.manifest
index 3eae8e1c..fbf90962 100644
--- a/common/chrome.manifest
+++ b/common/chrome.manifest
@@ -1,14 +1,14 @@
-resource dactyl-local ./
-resource dactyl-local-content content/
-resource dactyl-local-skin skin/
-resource dactyl-local-locale locale/
-
-resource dactyl-common ../common/
resource dactyl ../common/modules/
+resource dactyl-common ../common/
resource dactyl-content ../common/content/
resource dactyl-skin ../common/skin/
resource dactyl-locale ../common/locale/
+resource dactyl-local ./
+resource dactyl-local-content content/
+resource dactyl-local-skin skin/
+resource dactyl-local-locale locale/
+
content dactyl ../common/content/
component {16dc34f7-6d22-4aa4-a67f-2921fb5dcb69} components/commandline-handler.js