Viewing all changes in revision 1324.
- Committer: Michael Zanetti
- Date: 2014-10-14 09:42:10 UTC
- mfrom: (1314.1.51 unity8)
- Revision ID: michael.zanetti@canonical.com-20141014094210-b131g3rb77u2f5p2
merge trunk, update test to work with trunk
- files added:
- libs
- libs/UbuntuGestures
- qml/Components/Flickables
- tests/libs
- tests/libs/UbuntuGestures
- files removed:
- qml/Components/ListItems/Highlight.qml
- files renamed:
- plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h => plugins/Ubuntu/Gestures/UbuntuGesturesQmlGlobal.h
- qml/Components/ListItems/Base.qml => qml/Dash/DashCategoryBase.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
