f480333d31
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
18 lines
831 B
XML
18 lines
831 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<beansProjectDescription>
|
|
<version>1</version>
|
|
<pluginVersion><![CDATA[2.5.0.201008272200-CI-R3822-B852]]></pluginVersion>
|
|
<configSuffixes>
|
|
<configSuffix><![CDATA[xml]]></configSuffix>
|
|
</configSuffixes>
|
|
<enableImports><![CDATA[false]]></enableImports>
|
|
<configs>
|
|
<config>src/test/java/org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml</config>
|
|
<config>src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml</config>
|
|
<config>src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml</config>
|
|
<config>src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml</config>
|
|
</configs>
|
|
<configSets>
|
|
</configSets>
|
|
</beansProjectDescription>
|