Merge lp://staging/~ecx69/bellepoule/linux into lp://staging/bellepoule
Proposed by
betonniere
Status: | Merged |
---|---|
Merged at revision: | 249 |
Proposed branch: | lp://staging/~ecx69/bellepoule/linux |
Merge into: | lp://staging/bellepoule |
Diff against target: |
1526 lines (+235/-214) 40 files modified
Makefile (+4/-3) resources/glade/checkin.glade (+1/-1) resources/glade/pool_supervisor.glade (+3/-3) resources/glade/table.glade (+1/-1) sources/attribute.cpp (+26/-23) sources/attribute.hpp (+17/-17) sources/canvas.cpp (+5/-5) sources/canvas.hpp (+5/-5) sources/canvas_module.cpp (+2/-2) sources/canvas_module.hpp (+2/-2) sources/checkin.cpp (+17/-17) sources/checkin.hpp (+1/-1) sources/classification.cpp (+3/-3) sources/classification.hpp (+3/-3) sources/contest.cpp (+13/-13) sources/contest.hpp (+10/-10) sources/data.cpp (+7/-6) sources/data.hpp (+4/-4) sources/filter.cpp (+2/-2) sources/filter.hpp (+2/-2) sources/general_classification.cpp (+3/-2) sources/glade.cpp (+8/-4) sources/glade.hpp (+4/-4) sources/main.cpp (+1/-0) sources/module.cpp (+5/-3) sources/module.hpp (+5/-5) sources/object.cpp (+18/-13) sources/object.hpp (+6/-6) sources/player.cpp (+5/-5) sources/player.hpp (+7/-7) sources/players_list.cpp (+4/-4) sources/players_list.hpp (+4/-4) sources/pool.cpp (+15/-15) sources/pool.hpp (+5/-5) sources/pool_allocator.cpp (+3/-2) sources/score_collector.cpp (+2/-2) sources/score_collector.hpp (+2/-2) sources/stage.hpp (+1/-1) sources/table.cpp (+7/-5) sources/table.hpp (+2/-2) |
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+47016@code.staging.launchpad.net |
To post a comment you must log in.