Viewing all changes in revision 2110.
- Committer: Albert Astals Cid
- Date: 2016-06-02 07:43:13 UTC
- mfrom: (2039.198.42 unity8)
- Revision ID: albert.astals@canonical.com-20160602074313-qycavrlys0yftjfd
Merge
- 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
