root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
spring-framework/org.springframework.context/.settings
History
Chris Beams f480333d31 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.
 		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 UI message system initial commit; support for adding UI messages of different severities INFO, WARNING, ERROR, FATAL 2009-06-06 19:13:27 +00:00
org.springframework.ide.eclipse.beans.core.prefs Additional tests rounding out @ImportXml coverage 2009-11-07 03:53:58 +00:00
org.springframework.ide.eclipse.core.prefs Additional tests rounding out @ImportXml coverage 2009-11-07 03:53:58 +00:00