Viewing all changes in revision 3324.1.1.
- Committer: Pawel Stolowski
- Date: 2013-05-16 10:58:57 UTC
- mfrom: (3008.2.136 libunity-7.0-breakage)
- mto: This revision was merged to the branch mainline in revision 3325.
- Revision ID: pawel.stolowski@canonical.com-20130516105857-j51uiapol2zc8vr8
Merged smart scopes branch.
- files added:
- UnityCore/GSettingsScopes.cpp
- tests/data/unity
- tests/data/unity/scopes
- tests/data/unity/sounds
- tests/unity
- files removed:
- UnityCore/FilesystemLenses.cpp
- files renamed:
- UnityCore/ResultIterator.cpp => UnityCore/ModelIterator-inl.h
- UnityCore/ResultIterator.h => UnityCore/ModelIterator.h
- dash/LensBar.cpp => dash/ScopeBar.cpp
- dash/LensBar.h => dash/ScopeBar.h
- dash/LensBarIcon.cpp => dash/ScopeBarIcon.cpp
- dash/LensBarIcon.h => dash/ScopeBarIcon.h
- dash/LensView.cpp => dash/ScopeView.cpp
- dash/LensView.h => dash/ScopeView.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
resources/lock_icon.png
