Merge lp:~yrke/tapaal/tapaal-fix-1855675-notWorkingWithLatestUPPAAL into lp:tapaal
Proposed by
Kenneth Yrke Jørgensen
Status: | Merged |
---|---|
Approved by: | Jiri Srba |
Approved revision: | 1034 |
Merged at revision: | 1036 |
Proposed branch: | lp:~yrke/tapaal/tapaal-fix-1855675-notWorkingWithLatestUPPAAL |
Merge into: | lp:tapaal |
Diff against target: |
52 lines (+16/-7) 2 files modified
src/dk/aau/cs/verification/UPPAAL/Verifyta.java (+15/-6) src/pipe/gui/Pipe.java (+1/-1) |
To merge this branch: | bzr merge lp:~yrke/tapaal/tapaal-fix-1855675-notWorkingWithLatestUPPAAL |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jiri Srba | Approve | ||
Review via email: mp+376632@code.launchpad.net |
Commit message
Merged tapaal-
To post a comment you must log in.
I don't like the fact that it duplicates the version check code, this should really be extracted to a function. But as a bugfix this works.
Also changes the requred version of UPPAAL to 4.1.23 (latest), I made a request to UPPAAL devs if the can give us a version number based on the rev number.