[tycho/f18: 10/10] Merge branch 'master' into f18

Roland Grunberg rgrunber at fedoraproject.org
Tue Oct 30 22:54:23 UTC 2012


commit 367ad0daca6804d7546ac40032e21b8f21a20329
Merge: b0e6586 5861b98
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Tue Oct 30 16:29:52 2012 -0400

    Merge branch 'master' into f18
    
    master and f18 branches initially diverged due varying versions of
    maven-surefire, which caused different patches to be needed on these
    branches.

 .gitignore                            |    9 +-
 copy-platform-all                     |   30 ++-
 sources                               |    2 +-
 tycho-bootstrap.patch                 |  406 ++++++++++++++++----------------
 tycho-fix-build.patch                 |   50 +++--
 tycho-fix-surefire.patch              |   48 ++--
 tycho-maven-surefire.patch            |   56 +++---
 tycho-set-reactor-cache-version.patch |   13 +
 tycho-use-custom-resolver.patch       |   23 +-
 tycho.spec                            |   81 +++++--
 10 files changed, 401 insertions(+), 317 deletions(-)
---


More information about the scm-commits mailing list