Merge lp://staging/~danilovesky/workcraft/trunk-bug-1333721 into lp://staging/workcraft
Proposed by
Danil Sokolov
| Status: | Merged |
|---|---|
| Merged at revision: | 527 |
| Proposed branch: | lp://staging/~danilovesky/workcraft/trunk-bug-1333721 |
| Merge into: | lp://staging/workcraft |
| Diff against target: |
2946 lines (+965/-718) (has conflicts) 35 files modified
CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitSettings.java (+12/-14) CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java (+8/-0) CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionComponent.java (+58/-2) CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java (+8/-4) CpogsPlugin/src/org/workcraft/plugins/cpog/CpogProgrammer.java (+4/-4) CpogsPlugin/src/org/workcraft/plugins/cpog/CpogSettings.java (+73/-60) CpogsPlugin/src/org/workcraft/plugins/cpog/EncoderSettings.java (+16/-21) CpogsPlugin/src/org/workcraft/plugins/cpog/ProgrammerChainResultHandler.java (+2/-2) CpogsPlugin/src/org/workcraft/plugins/cpog/ProgrammerUtilitySettings.java (+37/-35) CpogsPlugin/src/org/workcraft/plugins/cpog/gui/EncoderConfigurationDialog.java (+2/-2) CpogsPlugin/src/org/workcraft/plugins/cpog/tools/EncoderPreferencesTool.java (+2/-2) DfsPlugin/src/org/workcraft/plugins/dfs/DfsSettings.java (+2/-3) DfsPlugin/src/org/workcraft/plugins/dfs/tools/SimulationTool.java (+21/-21) MpsatPlugin/src/org/workcraft/plugins/mpsat/MpsatUtilitySettings.java (+33/-28) MpsatPlugin/src/org/workcraft/plugins/mpsat/PunfUtilitySettings.java (+25/-23) MpsatPlugin/src/org/workcraft/plugins/mpsat/tasks/PunfTask.java (+2/-2) MpsatPlugin/src/org/workcraft/plugins/pcomp/PcompUtilitySettings.java (+17/-15) PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java (+5/-5) PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/SimulationTool.java (+5/-5) SONPlugin/src/org/workcraft/plugins/son/SONSettings.java (+69/-57) SONPlugin/src/org/workcraft/plugins/son/gui/ParallelSimDialog.java (+4/-5) SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java (+7/-10) STGPlugin/src/org/workcraft/plugins/stg/STGSettings.java (+3/-4) STGPlugin/src/org/workcraft/plugins/stg/tools/STGSimulationTool.java (+3/-3) WorkcraftCore/src/org/workcraft/plugins/BuiltinTools.java (+2/-0) WorkcraftCore/src/org/workcraft/plugins/layout/DotLayoutSettings.java (+39/-28) WorkcraftCore/src/org/workcraft/plugins/layout/DotLayoutTool.java (+1/-1) WorkcraftCore/src/org/workcraft/plugins/layout/RandomLayoutSettings.java (+52/-30) WorkcraftCore/src/org/workcraft/plugins/layout/RandomLayoutTool.java (+2/-2) WorkcraftCore/src/org/workcraft/plugins/shared/CommonCommentSettings.java (+48/-32) WorkcraftCore/src/org/workcraft/plugins/shared/CommonEditorSettings.java (+52/-46) WorkcraftCore/src/org/workcraft/plugins/shared/CommonSimulationSettings.java (+156/-0) WorkcraftCore/src/org/workcraft/plugins/shared/CommonVisualSettings.java (+75/-141) WorkcraftCore/src/org/workcraft/plugins/shared/PetrifyUtilitySettings.java (+47/-43) XmasPlugin/src/org/workcraft/plugins/xmas/XmasSettings.java (+73/-68) Text conflict in CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java Text conflict in CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionComponent.java Text conflict in CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CircuitSimulationTool.java |
| To merge this branch: | bzr merge lp://staging/~danilovesky/workcraft/trunk-bug-1333721 |
| 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
