root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Minor post-merge cleanup 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3783 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Chris Beams 2010-10-25 19:54:01 +00:00
parent 45e5b46fc2
commit 6e9e1f0946
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -9,3 +9,5 @@ org.springframework.test/test-output/
build.sh build.sh
org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs
org.springframework.jdbc/derby.log
spring-build

1
org.springframework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
View File

@ -18,6 +18,7 @@ package org.springframework.context.support;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
/** /**