Viewing all changes in revision 2754.2.4.
- Committer: Nick Dedekind
- Date: 2012-10-10 15:10:08 UTC
- mfrom: (2823 trunk)
- mto: This revision was merged to the branch mainline in revision 2831.
- Revision ID: nicholas.dedekind@gmail.com-20121010151008-71dyze5sxtq0ll1s
Merge with trunk
- files added:
- plugins/unityshell/resources/emblem_others.svg
- files renamed:
- launcher/BamfLauncherIcon.cpp => launcher/ApplicationLauncherIcon.cpp
- launcher/BamfLauncherIcon.h => launcher/ApplicationLauncherIcon.h
- tests/test_bamf_launcher_icon.cpp => tests/test_application_launcher_icon.cpp
- unity-shared/PluginAdapterCompiz.cpp => unity-shared/PluginAdapter.cpp
- unity-shared/PluginAdapterStandalone.cpp => unity-shared/StandaloneWindowManager.cpp
- unity-shared/KeyboardUtil.cpp => unity-shared/XKeyboardUtil.cpp
- unity-shared/KeyboardUtil.h => unity-shared/XKeyboardUtil.h
- unity-shared/WindowManager.cpp => unity-shared/XWindowManager.cpp
- unity-shared/WindowManager.h => unity-shared/XWindowManager.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
plugins/unityshell/resources/album_missing_preview.png
plugins/unityshell/resources/emblem_apps.svg
plugins/unityshell/resources/emblem_others.svg
plugins/unityshell/resources/emblem_video.svg
plugins/unityshell/resources/lens-nav-gwibber.svg
