Hi! On Fri, 23 Oct 2015 15:38:31 +0200, I wrote: > On Fri, 23 Oct 2015 12:48:23 +0200, I wrote: > > On Fri, 23 Oct 2015 10:07:49 +0200, I wrote: > > > On Mon, 19 Oct 2015 17:54:46 +0200, I wrote: > > > > [...] Jakub's big "Merge from > > > > gomp-4_1-branch to trunk", > > > > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>. > > > > Instead of attempting to merge that one in one go -- that is, to avoid > > > > having to deal with a ton of merge conflicts at once, and to allow for > > > > easier understanding of individual changes/regressions -- in the > > > > following I'll gradually merge individual "blocks" of all the > > > > gomp-4_1-branch changes into gomp-4_0-branch. > > [the last batch]
On top of that, it then was trivially easy to merge into gomp-4_0-branch
the real trunk commit of Jakub's big "Merge from gomp-4_1-branch to
trunk" -- only ChangeLog files remained to be updated. Committed to
gomp-4_0-branch in r229257:
commit 1bc39c0125a72e54eee9a366a655f4c8e4509d50
Merge: 17f04b7 43895be
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri Oct 23 13:43:20 2015 +0000
svn merge -r 228776:228777 svn+ssh://gcc.gnu.org/svn/gcc/trunk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229257
138bc75d-0d04-0410-961f-82ee72b054a4
Grüße
Thomas
signature.asc
Description: PGP signature
