Merge lp:~tapaal-contributor/tapaal/cpn-caseSensitivity into lp:~tapaal-contributor/tapaal/cpn-gui-dev
Proposed by
Kenneth Yrke Jørgensen
Status: | Merged |
---|---|
Approved by: | Jiri Srba |
Approved revision: | 1614 |
Merged at revision: | 1615 |
Proposed branch: | lp:~tapaal-contributor/tapaal/cpn-caseSensitivity |
Merge into: | lp:~tapaal-contributor/tapaal/cpn-gui-dev |
Diff against target: |
338 lines (+34/-33) 12 files modified
src/dk/aau/cs/io/LoadTACPN.java (+1/-0) src/dk/aau/cs/model/tapn/ConstantStore.java (+4/-4) src/dk/aau/cs/model/tapn/TimedArcPetriNet.java (+4/-4) src/dk/aau/cs/model/tapn/TimedArcPetriNetNetwork.java (+13/-13) src/net/tapaal/gui/petrinet/editor/ColorTypeDialogPanel.java (+4/-4) src/net/tapaal/gui/petrinet/editor/ConstantsDialogPanel.java (+1/-1) src/net/tapaal/gui/petrinet/editor/SharedPlaceNamePanel.java (+1/-1) src/net/tapaal/gui/petrinet/editor/SharedTransitionNamePanel.java (+1/-1) src/net/tapaal/gui/petrinet/editor/TemplateExplorer.java (+1/-1) src/net/tapaal/gui/petrinet/editor/VariablesDialogPanel.java (+2/-2) src/pipe/gui/petrinet/editor/PlaceEditorPanel.java (+1/-1) src/pipe/gui/petrinet/editor/TAPNTransitionEditor.java (+1/-1) |
To merge this branch: | bzr merge lp:~tapaal-contributor/tapaal/cpn-caseSensitivity |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jiri Srba | Approve | ||
Review via email: mp+415949@code.launchpad.net |
To post a comment you must log in.