Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-03-23 10:48:14 -0400
committerGlyn Normington2012-03-23 10:48:14 -0400
commita1272cff65c0d0034df86e43e52e7f6f53a70916 (patch)
tree3b78873f399d772567069220b55e2e6daf73d9bb /org.eclipse.virgo.kernel.agent.dm/.classpath
parente20f5bb34f558473378484cf07eaaf35dcb4f1ee (diff)
parenta34f075b8810918da4cee76f2711474a1bd0abbb (diff)
downloadorg.eclipse.virgo.kernel-a1272cff65c0d0034df86e43e52e7f6f53a70916.tar.gz
org.eclipse.virgo.kernel-a1272cff65c0d0034df86e43e52e7f6f53a70916.tar.xz
org.eclipse.virgo.kernel-a1272cff65c0d0034df86e43e52e7f6f53a70916.zip
Merge branch 'master' into 317943-replace-spring-dm-with-gemini-blueprint
Conflicts: build-kernel/build.xml build.versions org.eclipse.virgo.kernel.agent.dm/.classpath org.eclipse.virgo.kernel.artifact/.classpath org.eclipse.virgo.kernel.deployer.dm/.classpath org.eclipse.virgo.kernel.deployer.test/.classpath org.eclipse.virgo.kernel.deployer/.classpath org.eclipse.virgo.kernel.dmfragment/.classpath org.eclipse.virgo.kernel.model/.classpath org.eclipse.virgo.kernel.osgi/.classpath org.eclipse.virgo.kernel.services/.classpath org.eclipse.virgo.kernel.shell/.classpath org.eclipse.virgo.kernel.stubs/.classpath org.eclipse.virgo.kernel.test/.classpath org.eclipse.virgo.kernel.userregion/.classpath org.eclipse.virgo.kernel.userregionfactory/.classpath
Diffstat (limited to 'org.eclipse.virgo.kernel.agent.dm/.classpath')
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/.classpath2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.virgo.kernel.agent.dm/.classpath b/org.eclipse.virgo.kernel.agent.dm/.classpath
index e32f43f7..abe52694 100644
--- a/org.eclipse.virgo.kernel.agent.dm/.classpath
+++ b/org.eclipse.virgo.kernel.agent.dm/.classpath
@@ -41,7 +41,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.event/1.2.100.v20110110/org.eclipse.equinox.event-1.2.100.v20110110.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.region/1.0.0.v20110503/org.eclipse.equinox.region-1.0.0.v20110503.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120323094700/org.eclipse.virgo.kernel.core-3.5.0.BUILD-20120323094700.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/3.5.0.BUILD-20120323094700/org.eclipse.virgo.kernel.core-sources-3.5.0.BUILD-20120323094700.jar"/>
<classpathentry kind="output" path="target/classes"/>

Back to the top