Merge branch 'release/2.3.1'

72553957 · Jens Bendisposto · abe00a72 · 014a8e5a · 72553957 · 72553957
Commit 72553957 authored Apr 25, 2012 by Jens Bendisposto
--- a/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java
+++ b/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleSinceUnitTest.java
--- a/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java
+++ b/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleTriggerUnitTest.java
--- a/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java
+++ b/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleWeakUntilUnitTest.java
--- a/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java
+++ b/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleUntilUnitTest.java
--- a/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java
+++ b/de.prob.core/src/de/prob/core/domainobjects/ltl/unittests/CounterExampleYesterdayUnitTest.java
--- a/de.prob.plugin/META-INF/MANIFEST.MF
+++ b/de.prob.plugin/META-INF/MANIFEST.MF
--- a/de.prob.standalone.feature/.project
+++ b/de.prob.standalone.feature/.project
--- a/de.prob.standalone.feature/.settings/org.eclipse.core.resources.prefs
+++ b/de.prob.standalone.feature/.settings/org.eclipse.core.resources.prefs
--- a/de.prob.standalone.feature/.settings/org.eclipse.core.runtime.prefs
+++ b/de.prob.standalone.feature/.settings/org.eclipse.core.runtime.prefs
--- a/de.prob.standalone.feature/ProB_standalone.product
+++ b/de.prob.standalone.feature/ProB_standalone.product
--- a/de.prob.standalone.feature/build.properties
+++ b/de.prob.standalone.feature/build.properties
--- a/de.prob.standalone.feature/compile.de.prob.standalone.feature.xml
+++ b/de.prob.standalone.feature/compile.de.prob.standalone.feature.xml
--- a/de.prob.standalone.feature/feature.xml
+++ b/de.prob.standalone.feature/feature.xml
--- a/de.prob.standalone.feature/plugin_customization.ini
+++ b/de.prob.standalone.feature/plugin_customization.ini
--- a/de.prob.standalone/.classpath
+++ b/de.prob.standalone/.classpath
--- a/de.prob.standalone/.project
+++ b/de.prob.standalone/.project
--- a/de.prob.standalone/.settings/org.eclipse.core.resources.prefs
+++ b/de.prob.standalone/.settings/org.eclipse.core.resources.prefs
--- a/de.prob.standalone/.settings/org.eclipse.core.runtime.prefs
+++ b/de.prob.standalone/.settings/org.eclipse.core.runtime.prefs
--- a/de.prob.standalone/META-INF/MANIFEST.MF
+++ b/de.prob.standalone/META-INF/MANIFEST.MF
--- a/de.prob.standalone/ProB_Icon.icns
+++ b/de.prob.standalone/ProB_Icon.icns