« back to all changes in this revision
Viewing changes to Panel/graphics/Clock@18.png
- Committer: Michael Zanetti
- Date: 2013-06-26 09:26:51 UTC
- mfrom: (22.1.24 unity)
- Revision ID: michael.zanetti@canonical.com-20130626092651-ku85xmvlt2pjgypx
merge trunk
- files added:
- Components/IconUtil.js
- tests/qmltests/plugins/Unity/Notifications
- tests/uqmlscene
- files removed:
- Dash/DashPeople.qml
- Dash/People
- Dash/People/Preview
- Dash/People/graphics
- Dash/graphics/lensIcons
- tests/qmltests/Dash/People
- files renamed:
- Dash/GenericLensView.qml => Dash/GenericScopeView.qml
- Dash/LensDelegateMapper.qml => Dash/ScopeDelegateMapper.qml
- Dash/LensView.qml => Dash/ScopeView.qml
- plugins/Unity/lens.cpp => plugins/Unity/scope.cpp
- plugins/Unity/lens.h => plugins/Unity/scope.h
- plugins/Unity/lenses.cpp => plugins/Unity/scopes.cpp
- plugins/Unity/lenses.h => plugins/Unity/scopes.h
- tests/qmltests/Dash/qml/FakeLensView.qml => tests/qmltests/Dash/qml/FakeScopeView.qml
- tests/qmltests/Dash/qml/fake_generic_lensView.qml => tests/qmltests/Dash/qml/fake_generic_scopeView.qml
- tests/qmltests/Dash/qml/fake_lensView1.qml => tests/qmltests/Dash/qml/fake_scopeView1.qml
- tests/qmltests/Dash/qml/fake_lensView2.qml => tests/qmltests/Dash/qml/fake_scopeView2.qml
- tests/qmltests/Dash/qml/fake_lensView3.qml => tests/qmltests/Dash/qml/fake_scopeView3.qml
- tests/qmltests/Dash/qml/fake_lensView4.qml => tests/qmltests/Dash/qml/fake_scopeView4.qml
- tests/qmltests/Dash/tst_GenericLensView.qml => tests/qmltests/Dash/tst_GenericScopeView.qml
- tests/qmltests/Dash/tst_LensView.qml => tests/qmltests/Dash/tst_ScopeView.qml
- tests/qmltests/plugins/Unity/fake_lens.cpp => tests/qmltests/plugins/Unity/fake_scope.cpp
- tests/qmltests/plugins/Unity/fake_lens.h => tests/qmltests/plugins/Unity/fake_scope.h
- tests/qmltests/plugins/Unity/fake_lenses.cpp => tests/qmltests/plugins/Unity/fake_scopes.cpp
- tests/qmltests/plugins/Unity/fake_lenses.h => tests/qmltests/plugins/Unity/fake_scopes.h
- files modified:
- Bottombar/Bottombar.qml
added
removed
Panel/graphics/Clock@18.png
