build.xml | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 ignores .pc directory

src/org/jmock/lib/concurrent/DeterministicScheduler.java | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 to build with jdk 1.6 only

test/org/jmock/test/unit/support/MethodFactory.java | 16 8 + 8 - 0 !
test/org/jmock/test/unit/support/SyntheticEmptyInterfaceClassLoader.java | 20 12 + 8 - 0 !
2 files changed, 20 insertions(+), 16 deletions(-)

 to build with cglib2.2

build.xml | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 runs tests against system libraries

build.xml | 4 0 + 4 - 0 !
1 file changed, 4 deletions(-)

 to use javadoc from upstream

src/org/jmock/Expectations.java | 27 18 + 9 - 0 !
src/org/jmock/internal/InvocationExpectation.java | 26 21 + 5 - 0 !
src/org/jmock/internal/InvocationExpectationBuilder.java | 11 5 + 6 - 0 !
src/org/jmock/internal/ParametersMatcher.java | 12 12 + 0 - 0 !
src/org/jmock/internal/matcher/AllParametersMatcher.java | 80 80 + 0 - 0 !
test/org/jmock/test/acceptance/HamcrestTypeSafetyAcceptanceTests.java | 4 2 + 2 - 0 !
test/org/jmock/test/unit/internal/InvocationExpectationTests.java | 3 2 + 1 - 0 !
7 files changed, 140 insertions(+), 23 deletions(-)

 change api to support hamcrest 1.2
 Backport changes from upstream JMock 2.6.0