projects / profile / ivi / qtwayland.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc02797 4e39ec1)
Merge remote branch 'origin/master' into refactor
authorLars Knoll <lars.knoll@nokia.com>
Mon, 16 May 2011 08:19:02 +0000 (10:19 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Mon, 16 May 2011 08:19:02 +0000 (10:19 +0200)
commita85e53d7203576691dc18203d8784979b208033d
treefbae06e063cb8836d0d34555d2a5bb7da4bcdca5tree | snapshot
parentfc02797d0e86598a195b360e43bbe191da868647commit | diff
parent4e39ec1cd7aed754c9d6052c99438b77ab3678c8commit | diff
Merge remote branch 'origin/master' into refactor

Conflicts:
src/modules/qt_openvg.pri
src/widgets/to_be_moved/qlinecontrol_p.h
src/plugins/platforms/wayland/qwaylandclipboard.cpp diff1 | diff2 | blob | history
Domain: Graphics System / Display Server;