Merge lp:~widelands-dev/widelands/bug-1506084 into lp:widelands
Proposed by
TiborB
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 7555 | ||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1506084 | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
71 lines (+27/-10) 2 files modified
src/logic/ship.cc (+5/-1) test/maps/ship_transportation.wmf/scripting/test_rip_second_port_with_ware_in_portdock.lua (+22/-9) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1506084 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Review via email: mp+274758@code.launchpad.net |
Description of the change
This fixes regression test fail (I hope). Two issues here:
test script not working properly (changed, I added more sleeps)
small change in fleet/ship logic
To post a comment you must log in.