Viewing all changes in revision 2356.
- Committer: Lukáš Tinkl
- Date: 2016-06-01 20:16:51 UTC
- mfrom: (2285.38.58 unity8)
- Revision ID: lukas.tinkl@canonical.com-20160601201651-7fzy0uaq1j4rqsme
merge trunk
- files added:
- plugins/Cursor/CursorImageInfo.cpp
- tests/plugins/Cursor
- files removed:
- libs
- libs/UbuntuGestures
- tests/libs
- tests/libs/UbuntuGestures
- files renamed:
- plugins/Ubuntu/Gestures/FloatingFlickable.cpp => plugins/Ubuntu/Gestures/MouseEventGenerator.cpp
- plugins/Ubuntu/Gestures/FloatingFlickable.h => plugins/Ubuntu/Gestures/MouseEventGenerator.h
- tools/unix-signal-handler.cpp => src/UnixSignalHandler.cpp
- tools/unix-signal-handler.h => src/UnixSignalHandler.h
- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml => tests/qmltests/Components/tst_DragHandle/LeftEdgeShowable.qml
- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml => tests/qmltests/Components/tst_DragHandle/TopEdgeShowable.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
