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.stubs
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.stubs')
-rw-r--r--org.eclipse.virgo.kernel.stubs/.classpath4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.virgo.kernel.stubs/.classpath b/org.eclipse.virgo.kernel.stubs/.classpath
index 9a9a042e..e34b64ef 100644
--- a/org.eclipse.virgo.kernel.stubs/.classpath
+++ b/org.eclipse.virgo.kernel.stubs/.classpath
@@ -23,8 +23,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120717181632/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120717181632.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120717181632/org.eclipse.virgo.util.common-3.6.0.D-20120717181632.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120807141350/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120807141350.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120807141350/org.eclipse.virgo.util.common-3.6.0.D-20120807141350.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.BUILD-20120808164733/org.eclipse.virgo.nano.core-3.6.0.BUILD-20120808164733.jar"/>

Back to the top