Skip to main content

Browse the archive

Revision ef3e7753c6ee98e0c72c3cd915fda64ede27161b authored by Gaia Pushbot on 27 January 2014, 13:35:59 UTC, committed by Gaia Pushbot on 27 January 2014, 13:35:59 UTC 
Bumping gaia.json for 1 gaia-1_3 revision(s) a=gaia-bump
 
========

https://hg.mozilla.org/integration/gaia-1_3/rev/b013fab4b910
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #14653 from fcampo/mms-forward-subject-941030

Bug 941030 - [Messages] Follow up Bug 919966 - Ensure that forwarding a MMS with a subject fills in the subject in the composer(cherry picked from commit 4df4a5b17839fc6ce748029fc1e79bb2bde3cc87)

Conflicts:
	apps/sms/js/compose.js
	apps/sms/js/message_manager.js
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/compose_test.js
	apps/sms/test/unit/mock_compose.js
1 parent d5545e0
Raw File
CLOBBER 
# To Trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
#
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
#
# Note: The description below will be part of the error message shown to users.
#
# Modifying this file will now automatically clobber the buildbot machines \o/
#

<<<<<<< local
Bug 908695 required a clobber on Windows because bug 928195
=======
Bug 934646 needs a clobber -- the icon resources previously copied
into $OBJDIR/mobile/android/base/res will conflict with those in
$BRANDING_DIRECTORY/res.

>>>>>>> other
back to top