Commit ad6325cf authored by azara's avatar azara
Browse files

Merge remote-tracking branch 'origin/master' into CoreProduct

parents 3d76fb24 f963d22d
......@@ -2,3 +2,7 @@ target
bin
/.project
screenshots
tests/org.bonitasoft.studio.exporter.tests/.classpath
bundles/plugins/org.bonitasoft.studio.condition/.launch/Launch Runtime Eclipse.launch
bundles/plugins/org.bonitasoft.studio.condition/.launch/Subscription.launch
\ No newline at end of file
......@@ -13,11 +13,11 @@
<tychoVersion>0.18.0</tychoVersion>
<tychoExtrasVersion>0.18.0</tychoExtrasVersion>
<os-jvm-flags></os-jvm-flags>
<bundle.version>6.2.0-SNAPSHOT</bundle.version>
<engine.version>6.2.0-SNAPSHOT</engine.version>
<bundle.version>6.2.0.alpha-08</bundle.version>
<engine.version>6.2.0.alpha-08</engine.version>
<connector.version>6.1.1</connector.version>
<simulation.version>6.1.0</simulation.version>
<filters.version>6.2.0-SNAPSHOT</filters.version>
<filters.version>6.2.0.alpha-08</filters.version>
<theme.builder.version>6.1.0</theme.builder.version>
<watchdog.version>6.0.1</watchdog.version>
<p2MirrorUrl>http://repositories.rd.lan/p2/6.2</p2MirrorUrl>
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment