Merge lp://staging/~sergiusens/frame/update into lp://staging/frame/phablet
Proposed by
Sergio Schvezov
| Status: | Merged |
|---|---|
| Approved by: | Daniel d'Andrada |
| Approved revision: | 112 |
| Merged at revision: | 111 |
| Proposed branch: | lp://staging/~sergiusens/frame/update |
| Merge into: | lp://staging/frame/phablet |
| Diff against target: |
835 lines (+288/-104) 33 files modified
configure.ac (+1/-1) debian/changelog (+45/-0) debian/copyright (+3/-4) debian/libframe6.symbols (+3/-0) include/oif/frame.h.in (+39/-2) include/oif/frame_backend.h (+3/-0) include/oif/frame_x11.h (+4/-2) m4/gtest.m4 (+12/-4) m4/xorg-gtest.m4 (+2/-31) src/Makefile.am (+3/-2) src/device.cpp (+28/-0) src/device.h (+3/-0) src/libframe.ver (+6/-0) src/x11/device_x11.cpp (+12/-10) src/x11/device_x11.h (+2/-2) test/integration/events.cpp (+2/-3) test/integration/events.h (+2/-3) test/integration/x11/device.cpp (+2/-3) test/integration/x11/dynamic_type_checking.cpp (+2/-3) test/integration/x11/fixture.cpp (+2/-3) test/integration/x11/fixture.h (+2/-3) test/integration/x11/ids.cpp (+2/-3) test/integration/x11/recording.cpp (+2/-3) test/regular/Makefile.am (+2/-0) test/regular/x11-accept-touch.cpp (+86/-0) tools/Makefile.am (+4/-1) tools/common/device.c (+2/-3) tools/common/device.h (+2/-3) tools/common/frame.c (+2/-3) tools/common/frame.h (+2/-3) tools/common/touch.c (+2/-3) tools/common/touch.h (+2/-3) tools/frame-test-x11.c (+2/-3) |
| To merge this branch: | bzr merge lp://staging/~sergiusens/frame/update |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel d'Andrada (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-03-22.
Commit message
Merging in trunk and bumping version
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
Looks fine.