Commit [a29a00] app_admin bugtrackers clientapi dev master nikos parallel-rascal performance-analysis visualisation webappadmin webappadmin-jw History

Merge branch 'dev' of

https://nmatragkas@opensourceprojects.eu/git/p/ossmeter/code-0 into dev

Conflicts:
platform/org.ossmeter.platform.osgi/OSGi Master.launch

nmatra nmatra 2014-06-20

Browse code at this revision

Parent(s): [1b337f][c1cb59]

Child(ren): [9badf3]

1 2 > >> (Page 1 of 2)
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/factoids.ecore
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/StarRating.java
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/Factoid.java
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/Factoids.java
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/FactoidCollection.java
added platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/factoids.emf
added platform/org.ossmeter.platform/src/org/ossmeter/platform/AbstractFactoidMetricProvider.java
added factoids/org.ossmeter.factoid.cocomo/META-INF/MANIFEST.MF
added factoids/org.ossmeter.factoid.cocomo/.settings/org.eclipse.jdt.core.prefs
added factoids/org.ossmeter.factoid.cocomo/src/org/ossmeter/factoid/cocomo/CocomoFactoid.java
added factoids/org.ossmeter.factoid.cocomo/.classpath
added factoids/org.ossmeter.factoid.cocomo/build.properties
added factoids/org.ossmeter.factoid.cocomo/plugin.xml
added factoids/org.ossmeter.factoid.cocomo/.project
added third-party/org.apache.commons.math/META-INF/MANIFEST.MF
added third-party/org.apache.commons.math/.settings/org.eclipse.jdt.core.prefs
added third-party/org.apache.commons.math/commons-math3-3.3.jar
added third-party/org.apache.commons.math/.classpath
added third-party/org.apache.commons.math/build.properties
added third-party/org.apache.commons.math/.project
removed platform/org.ossmeter.platform.osgi/OSGi Master.launch
changed apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/util/ProjectCreationUtil.java
changed apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/App.java
changed apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/ResetApp.java
changed platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalManager.java
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/factoids.ecore Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/StarRating.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/Factoid.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/Factoids.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/FactoidCollection.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/factoids/factoids.emf Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform/src/org/ossmeter/platform/AbstractFactoidMetricProvider.java Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/.settings/org.eclipse.jdt.core.prefs Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/src/org/ossmeter/factoid/cocomo/CocomoFactoid.java Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/.classpath Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/build.properties Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/plugin.xml Diff Switch to side-by-side view
Loading...
factoids/org.ossmeter.factoid.cocomo/.project Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/.settings/org.eclipse.jdt.core.prefs Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/commons-math3-3.3.jar Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/.classpath Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/build.properties Diff Switch to side-by-side view
Loading...
third-party/org.apache.commons.math/.project Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/OSGi Master.launch
File was removed.
apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/util/ProjectCreationUtil.java Diff Switch to side-by-side view
Loading...
apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/App.java Diff Switch to side-by-side view
Loading...
apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/ResetApp.java Diff Switch to side-by-side view
Loading...
platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalManager.java Diff Switch to side-by-side view
Loading...
1 2 > >> (Page 1 of 2)