Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-08-09 16:11:54 -0400
committerChristopher Frost2012-08-09 16:11:54 -0400
commit6cee6246e51619a397086c86768eabdd1fcc0cd2 (patch)
treeb447620e95f1786b2f4b03cb20f9b935888f3d45 /org.eclipse.virgo.kernel.kerneldmfragment
parent5b95e901a332499a474b388cb4aa1f228ef25337 (diff)
parentaa27577f73d25f836ad109ec3efd5b3e8a5bd03d (diff)
downloadorg.eclipse.virgo.kernel-6cee6246e51619a397086c86768eabdd1fcc0cd2.tar.gz
org.eclipse.virgo.kernel-6cee6246e51619a397086c86768eabdd1fcc0cd2.tar.xz
org.eclipse.virgo.kernel-6cee6246e51619a397086c86768eabdd1fcc0cd2.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.kernel
Conflicts: 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 org.eclipse.virgo.management.shell/.classpath
Diffstat (limited to 'org.eclipse.virgo.kernel.kerneldmfragment')
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/.classpath2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
index 38ca13a3..ff4c73e5 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/.classpath
@@ -29,7 +29,7 @@
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/1.0.0.RELEASE/org.eclipse.gemini.blueprint.extender-sources-1.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-1.0.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/1.0.0.RELEASE/org.eclipse.gemini.blueprint.io-sources-1.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.0.200809221524/org.eclipse.osgi-3.5.0.200809221524.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120717201225/org.eclipse.virgo.medic-3.6.0.D-20120717201225.jar">
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120807142340/org.eclipse.virgo.medic-3.6.0.D-20120807142340.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>

Back to the top