Merge branch 'dev' into parallel-rascal

Conflicts:
tests/org.ossmeter.rascal.test/META-INF/MANIFEST.MF

Jurgen J. Vinju Jurgen J. Vinju 2014-12-02

1 2 3 .. 16 > >> (Page 1 of 16)
added tests/org.ossmeter.rascal.test/src/org/ossmeter/rascal/test/ProjectCreationUtil.java
removed metric-providers/org.ossmeter.severityclassifier.opennlptartarus.libsvm/plugin.xml
removed third-party/org.log4mongo
removed third-party/org.log4mongo/.settings
removed third-party/org.log4mongo/.settings/org.eclipse.jdt.core.prefs
removed third-party/org.log4mongo/META-INF
removed third-party/org.log4mongo/META-INF/MANIFEST.MF
removed third-party/org.log4mongo/.classpath
removed third-party/org.log4mongo/.project
removed third-party/org.log4mongo/build.properties
removed third-party/org.log4mongo/log4mongo-java-0.7.4.jar
removed RemoteSystemsTempFiles
removed RemoteSystemsTempFiles/.project
changed apps/org.ossmeter.platform.app.example/src/org/ossmeter/platform/app/example/App.java
changed apps/org.ossmeter.platform.app.uda/src/org/ossmeter/repository/app/App.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/client/OssmeterClient.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/Factoid.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/FactoidCategory.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/StarRating.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/bts/bugzilla/Bugzilla.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/forum/Forum.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/nntp/NntpNewsGroup.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/wiki/Wiki.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/eclipse/Article.java
changed client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/eclipse/Documentation.java
tests/org.ossmeter.rascal.test/src/org/ossmeter/rascal/test/ProjectCreationUtil.java Diff Switch to side-by-side view
Loading...
third-party/org.log4mongo
File was removed.
RemoteSystemsTempFiles
File was removed.
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.uda/src/org/ossmeter/repository/app/App.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/client/OssmeterClient.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/Factoid.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/FactoidCategory.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/platform/factoids/StarRating.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/bts/bugzilla/Bugzilla.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/forum/Forum.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/nntp/NntpNewsGroup.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/cc/wiki/Wiki.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/eclipse/Article.java Diff Switch to side-by-side view
Loading...
client/org.ossmeter.platform.client.java/src/org/ossmeter/repository/model/eclipse/Documentation.java Diff Switch to side-by-side view
Loading...
1 2 3 .. 16 > >> (Page 1 of 16)