Merge lp://qastaging/~linaro-graphics-wg/libmatrix/misc-changes-glmark2 into lp://qastaging/~jesse-barker/libmatrix/trunk
Proposed by
Alexandros Frantzis
| Status: | Merged |
|---|---|
| Merged at revision: | 41 |
| Proposed branch: | lp://qastaging/~linaro-graphics-wg/libmatrix/misc-changes-glmark2 |
| Merge into: | lp://qastaging/~jesse-barker/libmatrix/trunk |
| Diff against target: |
222 lines (+64/-51) 4 files modified
log.cc (+45/-50) log.h (+6/-1) program.cc (+12/-0) program.h (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~linaro-graphics-wg/libmatrix/misc-changes-glmark2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jesse Barker | Approve | ||
|
Review via email:
|
|||
Description of the change
Bring in changes from the in-tree version of libmatrix in glmark2.
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
Seems fine.