← Back to branch summary

~smspillaz/unity/unity.less-paint-insanity

~smspillaz/unity/unity.less-paint-insanity

Viewing all changes in revision 2374.

Committer: smspillaz
Date: 2012-06-12 04:30:24 UTC
mfrom: (2370.2.26 unity)
Revision ID: sam.spilsbury@canonical.com-20120612043024-wzscubj31gjetnmp

Merge lp:unity

files added:
UnityCore/GLibSource.cpp

UnityCore/GLibSource.h

hud/HudPrivate.cpp

hud/HudPrivate.h

tests/test_bamflaunchericon.cpp

tests/test_glib_source.cpp

tests/test_hud_button.cpp

tests/test_hud_private.cpp

tests/test_hud_view.cpp

unity-shared/UnityPaintSchedule.cpp

unity-shared/UnityPaintSchedule.h

files removed:
plugins/gtkloader

plugins/gtkloader/CMakeLists.txt

plugins/gtkloader/gtkloader.xml.in

plugins/gtkloader/src

plugins/gtkloader/src/gtkloader.cpp

plugins/gtkloader/src/gtkloader.h

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/DesktopUtilities.cpp

UnityCore/DesktopUtilities.h

UnityCore/GLibSignal-inl.h

dash/StandaloneDash.cpp

guides/cppguide.xml

hud/CMakeLists.txt

hud/HudButton.cpp

hud/HudButton.h

hud/HudIconTextureSource.cpp

hud/HudIconTextureSource.h

hud/HudView.cpp

hud/HudView.h

hud/StandaloneHud.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/HudLauncherIcon.cpp

launcher/HudLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/SimpleLauncherIcon.cpp

launcher/SimpleLauncherIcon.h

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

manual-tests/Panel.txt

manual-tests/Switcher.txt

panel/PanelIndicatorsView.cpp

panel/PanelIndicatorsView.h

panel/StandalonePanel.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/compizminimizedwindowhandler.h

plugins/unityshell/src/comptransientfor.h

plugins/unityshell/src/transientfor.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

po/POTFILES.in

tests/CMakeLists.txt

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/window_manager.py

tests/autopilot/unity/emulators/workspace.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_launcher.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_switcher.py

tests/data/ubuntu-software-center.desktop

tests/test_desktop_utilities.cpp

tests/test_lens.cpp

tests/test_main.cpp

tests/test_service_lens.c

tests/test_switcher_controller.cpp

tests/test_utils.h

tools/apply_unity_formatting.sh

tools/autopilot

tools/unity.cmake

unity-shared/CMakeLists.txt

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconTextureSource.h

unity-shared/PluginAdapterCompiz.cpp

unity-shared/PluginAdapterStandalone.cpp

unity-shared/SearchBar.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/DesktopUtilities.cpp

UnityCore/DesktopUtilities.h

UnityCore/GLibSignal-inl.h

UnityCore/GLibSource.cpp

UnityCore/GLibSource.h

dash/StandaloneDash.cpp

guides/cppguide.xml

hud/CMakeLists.txt

hud/HudButton.cpp

hud/HudButton.h

hud/HudIconTextureSource.cpp

hud/HudIconTextureSource.h

hud/HudPrivate.cpp

hud/HudPrivate.h

hud/HudView.cpp

hud/StandaloneHud.cpp

launcher/AbstractLauncherIcon.h

launcher/BFBLauncherIcon.cpp

launcher/BFBLauncherIcon.h

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/HudLauncherIcon.cpp

launcher/HudLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

launcher/SimpleLauncherIcon.cpp

launcher/SimpleLauncherIcon.h

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

manual-tests/Panel.txt

manual-tests/Switcher.txt

panel/PanelIndicatorsView.cpp

panel/PanelIndicatorsView.h

panel/StandalonePanel.cpp

plugins/gtkloader/

plugins/gtkloader/CMakeLists.txt

plugins/gtkloader/gtkloader.xml.in

plugins/gtkloader/src/

plugins/gtkloader/src/gtkloader.cpp

plugins/gtkloader/src/gtkloader.h

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/compizminimizedwindowhandler.h

plugins/unityshell/src/comptransientfor.h

plugins/unityshell/src/transientfor.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

tests/CMakeLists.txt

tests/autopilot/unity/emulators/switcher.py

tests/autopilot/unity/emulators/window_manager.py

tests/autopilot/unity/emulators/workspace.py

tests/autopilot/unity/tests/test_hud.py

tests/autopilot/unity/tests/test_launcher.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_showdesktop.py

tests/autopilot/unity/tests/test_switcher.py

tests/data/ubuntu-software-center.desktop

tests/test_bamflaunchericon.cpp

tests/test_desktop_utilities.cpp

tests/test_glib_source.cpp

tests/test_hud_button.cpp

tests/test_hud_private.cpp

tests/test_hud_view.cpp

tests/test_lens.cpp

tests/test_main.cpp

tests/test_service_lens.c

tests/test_switcher_controller.cpp

tests/test_utils.h

tools/apply_unity_formatting.sh

tools/autopilot

tools/unity.cmake

unity-shared/CMakeLists.txt

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/IconTextureSource.h

unity-shared/PluginAdapterCompiz.cpp

unity-shared/PluginAdapterStandalone.cpp

unity-shared/SearchBar.cpp

unity-shared/StaticCairoText.cpp

unity-shared/StaticCairoText.h

unity-shared/UnityPaintSchedule.cpp

unity-shared/UnityPaintSchedule.h

Older »