Merge lp:~widelands-dev/widelands/bug-1690519-playercolor into lp:widelands
Proposed by
GunChleoc
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 8363 | ||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1690519-playercolor | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
69 lines (+7/-7) 3 files modified
src/graphic/animation.cc (+4/-4) src/graphic/animation.h (+1/-1) src/graphic/playercolor.cc (+2/-2) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1690519-playercolor | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Klaus Halfmann | copilles, test, codereview | Approve | |
Review via email: mp+324053@code.launchpad.net |
Commit message
Create playercolor unique_ptr as late as possible.
Description of the change
I am assuming that some of the rashes are due to the changes in playercolor caused by this merge:
https:/
So I'm hoping that this change will help.
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 2196. State: passed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 232399748. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ bug_1690519_ playercolor- 2031.
Appveyor build 2031. State: success. Details: https:/