diff options
| author | Martin Stubenschrott <stubenschrott@gmx.net> | 2008-12-02 20:44:39 +0100 |
|---|---|---|
| committer | Martin Stubenschrott <stubenschrott@gmx.net> | 2008-12-02 20:44:39 +0100 |
| commit | a9a0d9b7e50fead0f83df9944befa4dd130baca2 (patch) | |
| tree | cb59f4cedf7089a8a11df3202dfc327d0d4f416f /muttator | |
| parent | 6d26836d9237866dfbdb6ddab07f71601f0a6a4e (diff) | |
| parent | 393ea749e9038de1cb364bf355d0e97183d07155 (diff) | |
| download | pentadactyl-a9a0d9b7e50fead0f83df9944befa4dd130baca2.tar.gz | |
Merge branch 'master' of vimperator.org:/git/vimperator/vimperator
Diffstat (limited to 'muttator')
| -rw-r--r-- | muttator/Makefile | 2 | ||||
| -rw-r--r-- | muttator/chrome.manifest | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/muttator/Makefile b/muttator/Makefile index 49d5dd5c..11862e34 100644 --- a/muttator/Makefile +++ b/muttator/Makefile @@ -3,4 +3,4 @@ VERSION = 0.5pre NAME = muttator -include ../liberator/Makefile.common +include Makefile.common diff --git a/muttator/chrome.manifest b/muttator/chrome.manifest index b3d4a238..0dedd743 100644 --- a/muttator/chrome.manifest +++ b/muttator/chrome.manifest @@ -6,13 +6,12 @@ content liberator ../liberator/content/ resource liberator ../liberator/modules/ skin liberator classic/1.0 ../liberator/skin/ -override chrome://liberator/content/liberator.dtd chrome://muttator/content/muttator.dtd -override chrome://liberator/content/config.js chrome://muttator/content/muttator.js +override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd +override chrome://liberator/content/config.js chrome://muttator/content/config.js overlay chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul overlay chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul -#1 -#override chrome://liberator/content/compose/liberator.xul chrome://liberator/content/liberator.xul -overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/compose/liberator.xul -overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/compose/compose.xul +overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/liberator.xul +overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul + |