Merge lp://staging/~danilovesky/workcraft/trunk-bug-1366078 into lp://staging/workcraft
Proposed by
Danil Sokolov
| Status: | Merged |
|---|---|
| Merged at revision: | 544 |
| Proposed branch: | lp://staging/~danilovesky/workcraft/trunk-bug-1366078 |
| Merge into: | lp://staging/workcraft |
| Diff against target: |
743 lines (+147/-109) 13 files modified
CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java (+11/-11) CpogsPlugin/src/org/workcraft/plugins/cpog/tasks/ProgrammerChainTask.java (+2/-27) DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowDeadlockTask.java (+6/-6) DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowHazardTask.java (+6/-6) DfsPlugin/src/org/workcraft/plugins/dfs/tasks/CheckDataflowTask.java (+8/-8) MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatUtilitySettings.java (+32/-1) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatChainTask.java (+12/-8) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java (+14/-9) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/PunfTask.java (+12/-7) MpsatPlugin/src/org/workcraft/plugins/pcomp/gui/PcompDialog.java (+17/-8) MpsatPlugin/src/org/workcraft/plugins/pcomp/tasks/PcompTask.java (+17/-11) MpsatPlugin/src/org/workcraft/plugins/pcomp/tools/PcompTool.java (+4/-1) PolicyNetPlugin/src/org/workcraft/plugins/policy/tasks/CheckDeadlockTask.java (+6/-6) |
| To merge this branch: | bzr merge lp://staging/~danilovesky/workcraft/trunk-bug-1366078 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Danil Sokolov | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Danil Sokolov (danilovesky) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
