Merge branch '3.1.x'

This commit is contained in:
Chris Beams
2011-12-22 14:55:10 +01:00
74 changed files with 8670 additions and 8634 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.spring-parent">
<property file="${basedir}/../build.properties"/>
<import file="${basedir}/../spring-build/resource/default.xml"/>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.spring-parent">
<property file="${basedir}/../build.properties"/>
<import file="${basedir}/../spring-build/resource/default.xml"/>
</project>