1 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
1 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
2 --- a/browser/app/Makefile.in |
2 --- a/browser/app/Makefile.in |
3 +++ b/browser/app/Makefile.in |
3 +++ b/browser/app/Makefile.in |
4 @@ -44,16 +44,17 @@ srcdir = @srcdir@ |
4 @@ -45,16 +45,17 @@ srcdir = @srcdir@ |
5 VPATH = @srcdir@ |
5 VPATH = @srcdir@ |
6 |
6 |
7 include $(DEPTH)/config/autoconf.mk |
7 include $(DEPTH)/config/autoconf.mk |
8 |
8 |
9 DIRS = profile/extensions |
9 DIRS = profile/extensions |
1101 + |
1101 + |
1102 +</window> |
1102 +</window> |
1103 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1103 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1104 --- a/browser/base/jar.mn |
1104 --- a/browser/base/jar.mn |
1105 +++ b/browser/base/jar.mn |
1105 +++ b/browser/base/jar.mn |
1106 @@ -21,16 +21,18 @@ browser.jar: |
1106 @@ -23,16 +23,18 @@ browser.jar: |
1107 * content/browser/aboutHome.css (content/aboutHome.css) |
|
1108 content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) |
|
1109 content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
1107 content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
|
1108 content/browser/aboutHome-snippet1.png (content/aboutHome-snippet1.png) |
|
1109 content/browser/aboutHome-snippet2.png (content/aboutHome-snippet2.png) |
1110 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1110 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1111 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1111 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1112 * content/browser/browser.css (content/browser.css) |
1112 * content/browser/browser.css (content/browser.css) |
1113 * content/browser/browser.js (content/browser.js) |
1113 * content/browser/browser.js (content/browser.js) |
1114 * content/browser/browser.xul (content/browser.xul) |
1114 * content/browser/browser.xul (content/browser.xul) |
1115 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1115 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1116 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1116 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1117 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1117 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1118 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1118 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
|
1119 content/browser/highlighter.xhtml (content/highlighter.xhtml) |
1119 * content/browser/inspector.html (content/inspector.html) |
1120 * content/browser/inspector.html (content/inspector.html) |
1120 * content/browser/scratchpad.xul (content/scratchpad.xul) |
1121 * content/browser/scratchpad.xul (content/scratchpad.xul) |
1121 * content/browser/scratchpad.js (content/scratchpad.js) |
1122 * content/browser/scratchpad.js (content/scratchpad.js) |
1122 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1123 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1123 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1124 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1124 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
|
1125 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1125 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1126 --- a/browser/components/build/nsModule.cpp |
1126 --- a/browser/components/build/nsModule.cpp |
1127 +++ b/browser/components/build/nsModule.cpp |
1127 +++ b/browser/components/build/nsModule.cpp |
1128 @@ -41,17 +41,17 @@ |
1128 @@ -41,17 +41,17 @@ |
1129 #include "nsBrowserCompsCID.h" |
1129 #include "nsBrowserCompsCID.h" |
1622 + |
1622 + |
1623 +#endif // nsunixshellservice_h____ |
1623 +#endif // nsunixshellservice_h____ |
1624 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1624 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1625 --- a/browser/installer/package-manifest.in |
1625 --- a/browser/installer/package-manifest.in |
1626 +++ b/browser/installer/package-manifest.in |
1626 +++ b/browser/installer/package-manifest.in |
1627 @@ -435,16 +435,17 @@ |
1627 @@ -440,16 +440,17 @@ |
1628 #endif |
1628 #endif |
1629 #endif |
1629 #endif |
1630 |
1630 |
1631 ; [Default Preferences] |
1631 ; [Default Preferences] |
1632 ; All the pref files must be part of base to prevent migration bugs |
1632 ; All the pref files must be part of base to prevent migration bugs |