On Fri, Jun 10, 2011 at 16:48, Chris Demetriou <c...@google.com> wrote: > testing with a native bootstrap, not quite done yet but since there were > no conflicts (except for the ChangeLog) it'll be fine. > > OK for google/gcc-4_6 assuming tests pass?
OK. > (Note that the properties changes were generated by svnmerge.py, and > TBH I have *no idea* what some of them are about.) Yeah, this is because we are doing multi-way merges. gcc-4-6_branch and google/main have different svn properties in a couple of files. It's harmless. Diego.
