Commit [3543d5] dev History

Merge branch 'master' into dev

Now we merge the master back into dev because we had some development on the master branch
after the earlier merge of dev into master and before we revert the merge of parallel-rascal on the dev branch.
Confusing he?

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

Browse code at this revision

Parent(s): [00a7fe][07339c]

Child(ren): [19b019]

changed platform/org.ossmeter.code.model/org.ossmeter.code.model.java/src/Java.rsc
changed platform/org.ossmeter.repository.model/META-INF/MANIFEST.MF
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...