-
Simon Eismann authored
Conflicts: sources/qpme.model/model/qpme.ecore sources/qpme.model/model/qpme.genmodel sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/DistributionFunction.java sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/ModelPackage.java sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/QpmeDocument.java sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/QueueingColorReference.java sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/impl/ModelPackageImpl.java sources/qpme.model/src/edu/kit/ipd/descartes/qpme/model/impl/QueueingColorReferenceImpl.java
aa9b22c3