mozilla-central: changeset 213785:5dde8ea48fef69066cc66f1d4b620071537ea274

author	Wes Kocher <wkocher@mozilla.com>
	Mon, 03 Nov 2014 19:31:47 -0800
changeset 213785	5dde8ea48fef69066cc66f1d4b620071537ea274
parent 213779	1782c0c6aee79fa037bb64040d5b6d3ca6182be1 (current diff)
parent 213784	9247b220e5958fbf692141e90328bddba7bdda61 (diff)
child 213797	ecaab80d7b3fda79b1288dbeb0b69044697ee11c
child 213831	6d6f30a6125752e09b1853d1ae4835c9895d49df
child 213843	53c21e42a5ec54547914ca1d8df7645fa9f43980
push id	27763
push user	kwierso@gmail.com
push date	Tue, 04 Nov 2014 03:32:25 +0000
treeherder	mozilla-central@5dde8ea48fef [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	merge
milestone	36.0a1
first release with	nightly linux32 5dde8ea48fef / 36.0a1 / 20141104030202 / files nightly linux64 5dde8ea48fef / 36.0a1 / 20141104030202 / files nightly mac 5dde8ea48fef / 36.0a1 / 20141104030202 / files nightly win32 5dde8ea48fef / 36.0a1 / 20141104030202 / files nightly win64 5dde8ea48fef / 36.0a1 / 20141104030202 / files
last release without	nightly linux32 0b81c10a9074 / 36.0a1 / 20141103030205 / files nightly linux64 0b81c10a9074 / 36.0a1 / 20141103030205 / files nightly mac 0b81c10a9074 / 36.0a1 / 20141103030205 / files nightly win32 0b81c10a9074 / 36.0a1 / 20141103030205 / files nightly win64 0b81c10a9074 / 36.0a1 / 20141103030205 / files
releases	nightly linux32 36.0a1 / 20141104030202 / pushlog to previous nightly linux64 36.0a1 / 20141104030202 / pushlog to previous nightly mac 36.0a1 / 20141104030202 / pushlog to previous nightly win32 36.0a1 / 20141104030202 / pushlog to previous nightly win64 36.0a1 / 20141104030202 / pushlog to previous

--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,13 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
+<<<<<<< local
 Bug 1092813 needs a CLOBBER
+=======
+Bug 1056337 - Change the default compiler on B2G ICS to gcc 4.8.
+>>>>>>> other