Merge lp://staging/~seb128/yatzy/score-with-bonus into lp://staging/yatzy
Proposed by
Sebastien Bacher
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 34 | ||||
| Proposed branch: | lp://staging/~seb128/yatzy/score-with-bonus | ||||
| Merge into: | lp://staging/yatzy | ||||
| Prerequisite: | lp://staging/~seb128/yatzy/new-column-layout | ||||
| Diff against target: |
11 lines (+1/-1) 1 file modified
main.qml (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~seb128/yatzy/score-with-bonus | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yatzy Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
count the bonus points in the score
Description of the change
count the bonus points in the score
note that the change is based on top of the new-layout-column changes to avoid merge conflicts
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
