Viewing all changes in revision 1982.
- Committer: Michael Zanetti
- Date: 2015-10-26 16:47:52 UTC
- mfrom: (1978.2.32 trunk)
- Revision ID: michael.zanetti@canonical.com-20151026164752-8yt7ngcng344mb67
merge trunk
- files added:
- plugins/Cursor
- plugins/Cursor/3rd_party
- plugins/Cursor/3rd_party/xcursor
- plugins/Unity/Platform
- tests/mocks/Cursor
- files removed:
- plugins/Utils/relativetimeformatter.cpp
- files renamed:
- qml/Stages/WindowMoveResizeArea.qml => qml/Stages/WindowResizeArea.qml
- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml => tests/qmltests/Stages/tst_WindowResizeArea.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
