Merge lp:~widelands-dev/widelands/mapobject_cleanup_misc into lp:widelands
Proposed by
GunChleoc
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 7092 | ||||
Proposed branch: | lp:~widelands-dev/widelands/mapobject_cleanup_misc | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
174 lines (+13/-21) 11 files modified
src/economy/fleet.cc (+1/-1) src/economy/portdock.cc (+2/-2) src/logic/bob.cc (+4/-4) src/logic/bob.h (+0/-2) src/logic/immovable.cc (+1/-1) src/logic/immovable.h (+0/-4) src/logic/ship.cc (+1/-1) src/logic/ship.h (+0/-2) src/logic/soldier.cc (+1/-1) src/logic/worker.cc (+2/-2) src/wui/shipwindow.cc (+1/-1) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/mapobject_cleanup_misc | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Review via email: mp+226756@code.launchpad.net |
Description of the change
MapObject cleanup for misc objects
To post a comment you must log in.