Merge lp://staging/~gunchleoc/widelands/mapobject_cleanup into lp://staging/widelands
Proposed by
GunChleoc
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 7112 | ||||
| Proposed branch: | lp://staging/~gunchleoc/widelands/mapobject_cleanup | ||||
| Merge into: | lp://staging/widelands | ||||
| Diff against target: |
274 lines (+17/-53) 12 files modified
src/logic/building.cc (+0/-11) src/logic/building.h (+0/-1) src/logic/constructionsite.cc (+3/-3) src/logic/dismantlesite.cc (+1/-1) src/logic/partially_finished_building.cc (+0/-13) src/logic/partially_finished_building.h (+0/-1) src/logic/player.cc (+1/-1) src/logic/soldier.cc (+5/-5) src/logic/worker.cc (+3/-3) src/logic/worker.h (+1/-11) src/wui/buildingwindow.cc (+1/-1) src/wui/productionsitewindow.cc (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~gunchleoc/widelands/mapobject_cleanup | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| SirVer | Approve | ||
|
Review via email:
|
|||
Description of the change
More Map_Object_Descr cleanup
To post a comment you must log in.
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Revision history for this message
| SirVer (sirver) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.