1119 +#endif |
1119 +#endif |
1120 +</window> |
1120 +</window> |
1121 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1121 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1122 --- a/browser/base/jar.mn |
1122 --- a/browser/base/jar.mn |
1123 +++ b/browser/base/jar.mn |
1123 +++ b/browser/base/jar.mn |
1124 @@ -22,16 +22,18 @@ browser.jar: |
1124 @@ -20,16 +20,18 @@ browser.jar: |
|
1125 * content/browser/aboutHome.xhtml (content/aboutHome.xhtml) |
|
1126 * content/browser/aboutHome.js (content/aboutHome.js) |
1125 * content/browser/aboutHome.css (content/aboutHome.css) |
1127 * content/browser/aboutHome.css (content/aboutHome.css) |
1126 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1128 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1127 content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png) |
|
1128 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1129 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1129 content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png) |
|
1130 * content/browser/browser.css (content/browser.css) |
1130 * content/browser/browser.css (content/browser.css) |
1131 * content/browser/browser.js (content/browser.js) |
1131 * content/browser/browser.js (content/browser.js) |
1132 * content/browser/browser.xul (content/browser.xul) |
1132 * content/browser/browser.xul (content/browser.xul) |
1133 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1133 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1134 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1134 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1135 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1135 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1136 * content/browser/credits.xhtml (content/credits.xhtml) |
|
1137 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1136 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
|
1137 * content/browser/inspector.html (content/inspector.html) |
1138 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1138 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1139 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1139 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1140 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1140 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1141 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
1141 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
1142 * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
1142 * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
1593 + |
1593 + |
1594 +#endif // nsunixshellservice_h____ |
1594 +#endif // nsunixshellservice_h____ |
1595 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1595 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1596 --- a/browser/installer/package-manifest.in |
1596 --- a/browser/installer/package-manifest.in |
1597 +++ b/browser/installer/package-manifest.in |
1597 +++ b/browser/installer/package-manifest.in |
1598 @@ -429,16 +429,17 @@ |
1598 @@ -431,16 +431,17 @@ |
1599 #endif |
1599 #endif |
1600 #endif |
1600 #endif |
1601 |
1601 |
1602 ; [Default Preferences] |
1602 ; [Default Preferences] |
1603 ; All the pref files must be part of base to prevent migration bugs |
1603 ; All the pref files must be part of base to prevent migration bugs |