Merge

Ashim Shahi Ashim Shahi 2014-06-13

added platform-extensions/org.ossmeter.platform.vcs.svn/.gitignore
changed platform-extensions/org.ossmeter.platform.vcs.workingcopy.svn/META-INF/MANIFEST.MF
changed platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/executors/ProjectExecutor.java
changed platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/services/MasterService.java
changed apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/App.java
changed platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalMetricProvider.java
changed platform/org.ossmeter.platform.osgi/META-INF/MANIFEST.MF
changed platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/services/MasterService.java
changed platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/OssmeterApplication.java
changed platform/org.ossmeter.platform.osgi/OSGi Master.launch
changed platform/org.ossmeter.platform.osgi/Ossmeter WorkerService (code-only).launch
changed platform/org.ossmeter.platform.osgi/Ossmeter WorkerService.launch
platform-extensions/org.ossmeter.platform.vcs.svn/.gitignore Diff Switch to side-by-side view
Loading...
platform-extensions/org.ossmeter.platform.vcs.workingcopy.svn/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/executors/ProjectExecutor.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/services/MasterService.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...
platform-extensions/org.ossmeter.platform.metricmanager.rascal/src/org/ossmeter/metricprovider/rascal/RascalMetricProvider.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/META-INF/MANIFEST.MF Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/services/MasterService.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/src/org/ossmeter/platform/osgi/OssmeterApplication.java Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/OSGi Master.launch Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/Ossmeter WorkerService (code-only).launch Diff Switch to side-by-side view
Loading...
platform/org.ossmeter.platform.osgi/Ossmeter WorkerService.launch Diff Switch to side-by-side view
Loading...