Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Maik Merten committed 2014-08-11 09:34:44 +02:00
commit 010c42753f
27 files changed
+25603 -71

No files matched your search

@@ -154,5 +154,10 @@ public class MulticompMachine implements Machine {
public int getMemorySize() {
return MEMORY_SIZE;
}
@Override
public String getName() {
return "Multicomp";
}
}