Viewing all changes in revision 3173.
- Committer: Brandon Schaefer
- Date: 2013-05-29 22:32:21 UTC
- mfrom: (3164.1.187 trunk)
- Revision ID: brandon.schaefer@canonical.com-20130529223221-vjjibffwmuycg46g
* Merged Trunk
- 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
- tests/test_gdbus_proxy.cpp => tests/test_glib_dbus_proxy.cpp
- launcher/FileManagerOpener.h => unity-shared/FileManager.h
- launcher/FileManagerOpenerImp.cpp => unity-shared/GnomeFileManager.cpp
- launcher/FileManagerOpenerImp.h => unity-shared/GnomeFileManager.h
- files modified:
- AUTHORS
expand all
collapse all
added
removed
resources/launcher_bfb.png
resources/lock_icon.png
resources/warning_icon.png
