Merge branch 'develop' into statesaving
Conflicts: sources/qpme.simqpn.kernel/META-INF/MANIFEST.MF sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/Place.java
No related branches found
No related tags found
Showing
- sources/qpme.model.feature/feature.xml 2 additions, 0 deletionssources/qpme.model.feature/feature.xml
- sources/qpme.qpe.core/content/root.xhtml 1 addition, 0 deletionssources/qpme.qpe.core/content/root.xhtml
- sources/qpme.qpe.core/plugin.xml 16 additions, 0 deletionssources/qpme.qpe.core/plugin.xml
- sources/qpme.qpe.core/src/main/de/tud/cs/qpe/editors/query/model/SimulationResults.java 3 additions, 2 deletions.../de/tud/cs/qpe/editors/query/model/SimulationResults.java
- sources/qpme.qpe.core/src/main/de/tud/cs/qpe/rcp/ApplicationActionBarAdvisor.java 2 additions, 4 deletions...c/main/de/tud/cs/qpe/rcp/ApplicationActionBarAdvisor.java
- sources/qpme.qpe.feature/feature.xml 7 additions, 0 deletionssources/qpme.qpe.feature/feature.xml
- sources/qpme.qpe.feature/root_files/README.txt 1 addition, 0 deletionssources/qpme.qpe.feature/root_files/README.txt
- sources/qpme.releng.product/qpme.product 4 additions, 0 deletionssources/qpme.releng.product/qpme.product
- sources/qpme.releng.targetplatform/qpme.releng.targetplatform.target 14 additions, 14 deletions...e.releng.targetplatform/qpme.releng.targetplatform.target
- sources/qpme.simqpn.kernel/META-INF/MANIFEST.MF 1 addition, 0 deletionssources/qpme.simqpn.kernel/META-INF/MANIFEST.MF
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/SimQPNConfiguration.java 13 additions, 2 deletions...rnel/src/de/tud/cs/simqpn/kernel/SimQPNConfiguration.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/console/SimQPN.java 10 additions, 4 deletions...pn.kernel/src/de/tud/cs/simqpn/kernel/console/SimQPN.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/Net.java 2 additions, 2 deletions...mqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/Net.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/Place.java 0 additions, 210 deletions...pn.kernel/src/de/tud/cs/simqpn/kernel/entities/Place.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/QPlace.java 0 additions, 25 deletions...n.kernel/src/de/tud/cs/simqpn/kernel/entities/QPlace.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/executor/parallel/JBarrierExecutor.java 5 additions, 7 deletions.../cs/simqpn/kernel/executor/parallel/JBarrierExecutor.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/executor/parallel/LP.java 69 additions, 113 deletions...nel/src/de/tud/cs/simqpn/kernel/executor/parallel/LP.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/executor/parallel/barrier/BarrierFactory.java 0 additions, 10 deletions...mqpn/kernel/executor/parallel/barrier/BarrierFactory.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/executor/parallel/barrier/action/BarrierAction.java 65 additions, 51 deletions...ernel/executor/parallel/barrier/action/BarrierAction.java
- sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/executor/parallel/barrier/action/PredecessorBarrierAction.java 0 additions, 75 deletions...tor/parallel/barrier/action/PredecessorBarrierAction.java
Loading
Please register or sign in to comment