Merge lp://staging/~danilovesky/workcraft/trunk-bug-1449675 into lp://staging/workcraft
Proposed by
Danil Sokolov
| Status: | Merged |
|---|---|
| Merged at revision: | 605 |
| Proposed branch: | lp://staging/~danilovesky/workcraft/trunk-bug-1449675 |
| Merge into: | lp://staging/workcraft |
| Diff against target: |
163 lines (+29/-28) 8 files modified
CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitStgUtils.java (+1/-3) CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java (+1/-3) MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatResultParser.java (+6/-0) MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatSettings.java (+0/-1) MpsatPlugin/src/org/workcraft/plugins/mpsat/gui/SolutionsDialog.java (+2/-2) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatChainTask.java (+3/-6) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatConformationTask.java (+1/-3) WorkcraftCore/src/org/workcraft/util/FileUtils.java (+15/-10) |
| To merge this branch: | bzr merge lp://staging/~danilovesky/workcraft/trunk-bug-1449675 |
| 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
