| commit | 2e5fec9688f5b36246a46a508a648ae8299e6b06 | [log] [tgz] |
|---|---|---|
| author | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Fri Jun 29 20:10:53 2012 +0300 |
| committer | Borislav Kapukaranov <b.kapukaranov@gmail.com> | Fri Jun 29 20:10:53 2012 +0300 |
| tree | d4f6d0770fe8f331eaa8acd525a2b2da3b88d50c | |
| parent | 931141c169b4c468d5eb1ba97b9bcbfd3ca7ab17 [diff] | |
| parent | 7c9ac8c2003f2de2eaf6fc86a559dc872616ff33 [diff] |
Merge branch 'equinox-upgrade' into master Conflicts: build-nano/gemini-web-ivy.xml build-nano/publish_resources/features/org.eclipse.gemini.web/feature.xml build.versions org.eclipse.virgo.deployer.api/.classpath org.eclipse.virgo.deployer.hot/.classpath org.eclipse.virgo.kernel.core/.classpath org.eclipse.virgo.nano.deployer/.classpath org.eclipse.virgo.nano.services.concurrent/.classpath org.eclipse.virgo.nano.services.ds/.classpath org.eclipse.virgo.nano.smoketest/.classpath