Merge lp:~matt-xv/damn-monkey/new-sprites into lp:damn-monkey
Proposed by
Matthis FRENAY
Status: | Merged |
---|---|
Approved by: | Fabien LOISON |
Approved revision: | 28 |
Merged at revision: | 27 |
Proposed branch: | lp:~matt-xv/damn-monkey/new-sprites |
Merge into: | lp:damn-monkey |
Diff against target: |
28 lines (+5/-1) (has conflicts) 2 files modified
pixmaps/jumpman.sprite (+1/-1) pixmaps/lady.sprite (+4/-0) Conflict adding file pixmaps/life.png. Moved existing file to pixmaps/life.png.moved. |
To merge this branch: | bzr merge lp:~matt-xv/damn-monkey/new-sprites |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fabien LOISON | Pending | ||
Review via email: mp+63132@code.launchpad.net |
To post a comment you must log in.