Merge lp:~widelands-dev/widelands/fix-bug-1208130 into lp:widelands
Proposed by
cghislai
Status: | Merged |
---|---|
Merged at revision: | 6715 |
Proposed branch: | lp:~widelands-dev/widelands/fix-bug-1208130 |
Merge into: | lp:widelands |
Diff against target: |
127 lines (+35/-25) 3 files modified
src/wui/buildingwindow.cc (+1/-19) src/wui/buildingwindow.h (+0/-2) src/wui/soldierlist.cc (+34/-4) |
To merge this branch: | bzr merge lp:~widelands-dev/widelands/fix-bug-1208130 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nasenbaer | Approve | ||
Teppo Mäenpää | Needs Resubmitting | ||
SirVer | Needs Fixing | ||
Review via email: mp+179293@code.launchpad.net |
Description of the change
I suggest merging Teppo's fix to the desync issue with soldiers preference. It has been tested
To post a comment you must log in.
This has conflicts with master - hard to see what you actually changed.