Clone
Luke Daley
committed
on 15 Jul 13
Merge branch 'release'
Conflicts:
subprojects/core/src/main/groovy/org/gradle/api/file/CopySpec.java
subprojects/core/src/main/groovy/org/… Show more
Merge branch 'release'

Conflicts:

        subprojects/core/src/main/groovy/org/gradle/api/file/CopySpec.java

        subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopySpecVisitor.java

        subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java

        subprojects/core/src/main/groovy/org/gradle/util/SingleMessageLogger.java

        subprojects/docs/src/docs/release/notes.md

        subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/AggregateTestResultsProvider.java

        subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/BinaryResultBackedTestResultsProvider.java

        subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestReportDataCollector.java

        subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestResultsProvider.java

        subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestReportDataCollectorSpec.groovy

        subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/result/TestResultSerializerTest.groovy

        subprojects/plugins/src/testFixtures/groovy/org/gradle/api/internal/tasks/testing/BuildableTestResultsProvider.groovy

Show less

master + 415 more