Merge lp:~widelands-dev/widelands/bug1201398 into lp:widelands

Proposed by cghislai on 2013-07-21
Status: Merged
Merged at revision: 6651
Proposed branch: lp:~widelands-dev/widelands/bug1201398
Merge into: lp:widelands
Diff against target: 0 lines
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug1201398
Reviewer Review Type Date Requested Status
SirVer 2013-07-21 Approve on 2013-07-21
Review via email:

Description of the change

Small fixes, see bug reports.

Thanks for testing!

To post a comment you must log in.
SirVer (sirver) wrote :

there are merge conflicts in this proposal.

review: Needs Fixing
6641. By cghislai on 2013-07-21

Merge trunk

cghislai (charlyghislain) wrote :

should be fine now

6642. By SirVer on 2013-07-21

Fixed typo that prevented compiling.

SirVer (sirver) wrote :

lgtm. small fix was needed, a typo in unique_ptr.

review: Approve
cghislai (charlyghislain) wrote :

Oops, sorry

Preview Diff