1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/CLOBBER Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,25 @@
1.4 +# To Trigger a clobber replace ALL of the textual description below,
1.5 +# giving a bug number and a one line description of why a clobber is
1.6 +# required. Modifying this file will make configure check that a
1.7 +# clobber has been performed before the build can continue.
1.8 +#
1.9 +# MERGE NOTE: When merging two branches that require a CLOBBER, you should
1.10 +# merge both CLOBBER descriptions, to ensure that users on
1.11 +# both branches correctly see the clobber warning.
1.12 +#
1.13 +# O <-- Users coming from both parents need to Clobber
1.14 +# / \
1.15 +# O O
1.16 +# | |
1.17 +# O <-- Clobber O <-- Clobber
1.18 +#
1.19 +# Note: The description below will be part of the error message shown to users.
1.20 +#
1.21 +# Modifying this file will now automatically clobber the buildbot machines \o/
1.22 +#
1.23 +
1.24 +# Are you updating CLOBBER because you think it's needed for your WebIDL
1.25 +# changes to stick? As of bug 928195, this shouldn't be necessary! Please
1.26 +# don't change CLOBBER for WebIDL changes any more.
1.27 +
1.28 +Merge day clobber
1.29 \ No newline at end of file
