Viewing all changes in revision 2769.5.3.
- Committer: Daniel van Vugt
- Date: 2012-10-11 01:44:15 UTC
- mfrom: (2826 trunk)
- mto: This revision was merged to the branch mainline in revision 2847.
- Revision ID: daniel.van.vugt@canonical.com-20121011014415-jvudq1d7bn1z268j
Merge latest lp:unity and fix a conflict
- files added:
- plugins/unityshell/src/glow_texture.h
- 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
