Merge branch 'dev'

We are now merging the reverted merge we did on the dev branch into the master. It's confusing.

Jurgen J. Vinju Jurgen J. Vinju 2014-12-04

added RemoteSystemsTempFiles/.project
removed tests/org.ossmeter.rascal.test/src/org/ossmeter/rascal/test/ProjectCreationUtil.java
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO.PHP/src/OOPHP.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO.java/src/OOJava.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/LCOM.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/NOA.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/NOM.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/RFC.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/mood/MIF.rsc
changed metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/OO.rsc
changed platform-extensions/org.ossmeter.platform.bugtrackingsystem.github/META-INF/MANIFEST.MF
changed platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalManager.java
changed platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalMetricProvider.java
changed tests/org.ossmeter.rascal.test/META-INF/MANIFEST.MF
changed tests/org.ossmeter.rascal.test/src/org/ossmeter/rascal/test/RascalTestCaseGenerator.java
changed platform/org.ossmeter.code.model/org.ossmeter.code.model.java/src/Java.rsc
changed platform/org.ossmeter.repository.model/META-INF/MANIFEST.MF
RemoteSystemsTempFiles/.project Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO.PHP/src/OOPHP.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO.java/src/OOJava.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/LCOM.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/NOA.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/NOM.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/ck/RFC.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/mood/MIF.rsc Diff Switch to side-by-side view
Loading...
metric-providers/org.ossmeter.metricprovider.trans.rascal.OO/src/OO.rsc Diff Switch to side-by-side view
Loading...
platform-extensions/org.ossmeter.platform.bugtrackingsystem.github/META-INF/MANIFEST.MF 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...
platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalMetricProvider.java Diff Switch to side-by-side view
Loading...
tests/org.ossmeter.rascal.test/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...
tests/org.ossmeter.rascal.test/src/org/ossmeter/rascal/test/RascalTestCaseGenerator.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.code.model/org.ossmeter.code.model.java/src/Java.rsc Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.repository.model/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...