Chris Beams 45e5b46fc2 Merge 3.1.0 development branch into trunk ...

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.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387

2010-10-25 19:48:20 +00:00

..

org.eclipse.jdt.core.prefs

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

org.eclipse.jdt.ui.prefs

…