Merge lp://staging/~ecx69/bellepoule/linux into lp://staging/bellepoule
Proposed by
betonniere
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp://staging/~ecx69/bellepoule/linux |
Merge into: | lp://staging/bellepoule |
Diff against target: |
391 lines (+88/-59) 11 files modified
Makefile (+28/-0) sources/attribute.cpp (+2/-2) sources/contest.cpp (+13/-13) sources/filter.cpp (+11/-12) sources/filter.hpp (+2/-2) sources/glade.cpp (+6/-7) sources/main.cpp (+18/-16) sources/module.cpp (+2/-1) sources/players_list.cpp (+2/-2) sources/players_list.hpp (+1/-1) sources/pool_allocator.cpp (+3/-3) |
To merge this branch: | bzr merge lp://staging/~ecx69/bellepoule/linux |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
betonniere | Approve | ||
Review via email: mp+24294@code.staging.launchpad.net |
To post a comment you must log in.