Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | # To Trigger a clobber replace ALL of the textual description below, |
michael@0 | 2 | # giving a bug number and a one line description of why a clobber is |
michael@0 | 3 | # required. Modifying this file will make configure check that a |
michael@0 | 4 | # clobber has been performed before the build can continue. |
michael@0 | 5 | # |
michael@0 | 6 | # MERGE NOTE: When merging two branches that require a CLOBBER, you should |
michael@0 | 7 | # merge both CLOBBER descriptions, to ensure that users on |
michael@0 | 8 | # both branches correctly see the clobber warning. |
michael@0 | 9 | # |
michael@0 | 10 | # O <-- Users coming from both parents need to Clobber |
michael@0 | 11 | # / \ |
michael@0 | 12 | # O O |
michael@0 | 13 | # | | |
michael@0 | 14 | # O <-- Clobber O <-- Clobber |
michael@0 | 15 | # |
michael@0 | 16 | # Note: The description below will be part of the error message shown to users. |
michael@0 | 17 | # |
michael@0 | 18 | # Modifying this file will now automatically clobber the buildbot machines \o/ |
michael@0 | 19 | # |
michael@0 | 20 | |
michael@0 | 21 | # Are you updating CLOBBER because you think it's needed for your WebIDL |
michael@0 | 22 | # changes to stick? As of bug 928195, this shouldn't be necessary! Please |
michael@0 | 23 | # don't change CLOBBER for WebIDL changes any more. |
michael@0 | 24 | |
michael@0 | 25 | Merge day clobber |