mozilla-inbound: changeset 277838:1db8e4432568ce8ea542dedd834e1d597b4312ba

author	Alexandre Lissy <lissyx@lissyx.dyndns.org>
	Mon, 28 Dec 2015 17:23:00 +0100
changeset 277838	1db8e4432568ce8ea542dedd834e1d597b4312ba
parent 277837	6967cf4e2fd9decfa05411acad9ec90eeb152889
child 277839	29aa734ee232e16fde46d2cad49bf17bba9561ac
push id	69628
push user	cbook@mozilla.com
push date	Wed, 30 Dec 2015 11:16:09 +0000
treeherder	mozilla-inbound@b493cf33851f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	kitcambridge
bugs	1235050
milestone	46.0a1
first release with	nightly linux32 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly linux64 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly mac c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly win32 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly win64 c690c50b2b54 / 46.0a1 / 20151230030234 / files
last release without	nightly linux32 7c83da46ea74 / 46.0a1 / 20151228030213 / files nightly linux64 7c83da46ea74 / 46.0a1 / 20151228030213 / files nightly mac 7c83da46ea74 / 46.0a1 / 20151228030213 / files nightly win32 7c83da46ea74 / 46.0a1 / 20151228030213 / files nightly win64 7c83da46ea74 / 46.0a1 / 20151228030213 / files

--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -643,19 +643,19 @@
 @RESPATH@/components/XULStore.manifest
 @RESPATH@/components/Webapps.js
 @RESPATH@/components/Webapps.manifest
 @RESPATH@/components/AppsService.js
 @RESPATH@/components/AppsService.manifest
 @RESPATH@/components/Push.js
 @RESPATH@/components/Push.manifest
 #ifdef MOZ_SIMPLEPUSH
-@RESPATH@/components/PushComponents.js
+@RESPATH@/components/PushServiceLauncher.js
 #else
-@RESPATH@/components/PushServiceLauncher.js
+@RESPATH@/components/PushComponents.js
 #endif
 
 @RESPATH@/components/InterAppComm.manifest
 @RESPATH@/components/InterAppCommService.js
 @RESPATH@/components/InterAppConnection.js
 @RESPATH@/components/InterAppMessagePort.js
 
 @RESPATH@/components/nsDOMIdentity.js