1054 * content/browser/browser.js (content/browser.js) |
1054 * content/browser/browser.js (content/browser.js) |
1055 * content/browser/browser.xul (content/browser.xul) |
1055 * content/browser/browser.xul (content/browser.xul) |
1056 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1056 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1057 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1057 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1058 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1058 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
|
1059 * content/browser/content.js (content/content.js) |
1059 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1060 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1060 content/browser/highlighter.xhtml (content/highlighter.xhtml) |
|
1061 * content/browser/inspector.html (content/inspector.html) |
1061 * content/browser/inspector.html (content/inspector.html) |
1062 * content/browser/scratchpad.xul (content/scratchpad.xul) |
|
1063 * content/browser/scratchpad.js (content/scratchpad.js) |
|
1064 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1062 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1065 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1063 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
|
1064 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
|
1065 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
1066 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1066 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1067 --- a/browser/components/build/nsModule.cpp |
1067 --- a/browser/components/build/nsModule.cpp |
1068 +++ b/browser/components/build/nsModule.cpp |
1068 +++ b/browser/components/build/nsModule.cpp |
1069 @@ -41,17 +41,17 @@ |
1069 @@ -41,17 +41,17 @@ |
1070 #include "nsBrowserCompsCID.h" |
1070 #include "nsBrowserCompsCID.h" |
1563 + |
1563 + |
1564 +#endif // nsunixshellservice_h____ |
1564 +#endif // nsunixshellservice_h____ |
1565 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1565 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1566 --- a/browser/installer/package-manifest.in |
1566 --- a/browser/installer/package-manifest.in |
1567 +++ b/browser/installer/package-manifest.in |
1567 +++ b/browser/installer/package-manifest.in |
1568 @@ -440,16 +440,17 @@ |
1568 @@ -434,16 +434,17 @@ |
1569 #endif |
1569 #endif |
1570 #endif |
1570 #endif |
1571 |
1571 |
1572 ; [Default Preferences] |
1572 ; [Default Preferences] |
1573 ; All the pref files must be part of base to prevent migration bugs |
1573 ; All the pref files must be part of base to prevent migration bugs |