← Back to branch summary

~vanvugt/unity/fix-865006

~vanvugt/unity/fix-865006

Viewing all changes in revision 2388.1.4.

Committer: Andrea Azzarone
Date: 2012-06-12 08:23:23 UTC
mfrom: (2400 unity)
mto: This revision was merged to the branch mainline in revision 2404.
Revision ID: azzaronea@gmail.com-20120612082323-zdw8jxwjcia8vi71

Merge trunk.

files modified:
UnityCore/DBusIndicators.cpp

UnityCore/DBusIndicators.h

UnityCore/FilesystemLenses.cpp

UnityCore/Filter.cpp

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibSource.h

UnityCore/Indicator.cpp

UnityCore/Indicator.h

UnityCore/IndicatorEntry.h

UnityCore/Indicators.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

hud/HudController.cpp

hud/HudController.h

hud/HudView.cpp

hud/HudView.h

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/Decaymulator.cpp

launcher/Decaymulator.h

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherDragWindow.cpp

launcher/LauncherDragWindow.h

launcher/LauncherHideMachine.cpp

launcher/LauncherHideMachine.h

launcher/LauncherHoverMachine.cpp

launcher/LauncherHoverMachine.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/LauncherModel.h

launcher/PointerBarrier.cpp

launcher/PointerBarrier.h

launcher/SoftwareCenterLauncherIcon.h

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

panel/PanelController.cpp

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelTitlebarGrabAreaView.cpp

panel/PanelTitlebarGrabAreaView.h

panel/PanelTray.cpp

panel/PanelTray.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

tests/CMakeLists.txt

tests/test_bamflaunchericon.cpp

tests/test_glib_source.cpp

tests/test_switcher_controller.cpp

unity-shared/Animator.cpp

unity-shared/Animator.h

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/IconLoader.cpp

unity-shared/IconLoader.h

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/SearchBarSpinner.cpp

unity-shared/SearchBarSpinner.h

unity-shared/UScreen.cpp

unity-shared/UScreen.h

Show diffs side-by-side

added added

removed removed

UnityCore/DBusIndicators.cpp

UnityCore/DBusIndicators.h

UnityCore/FilesystemLenses.cpp

UnityCore/Filter.cpp

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibSource.h

UnityCore/Indicator.cpp

UnityCore/Indicator.h

UnityCore/IndicatorEntry.h

UnityCore/Indicators.cpp

dash/DashController.cpp

dash/DashController.h

dash/DashView.cpp

dash/DashView.h

dash/LensView.cpp

dash/LensView.h

dash/PlacesGroup.cpp

dash/PlacesGroup.h

dash/ResultViewGrid.cpp

dash/ResultViewGrid.h

hud/HudController.cpp

hud/HudController.h

hud/HudView.cpp

launcher/BamfLauncherIcon.cpp

launcher/BamfLauncherIcon.h

launcher/Decaymulator.cpp

launcher/Decaymulator.h

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherDragWindow.cpp

launcher/LauncherDragWindow.h

launcher/LauncherHideMachine.cpp

launcher/LauncherHideMachine.h

launcher/LauncherHoverMachine.cpp

launcher/LauncherHoverMachine.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/LauncherModel.h

launcher/PointerBarrier.cpp

launcher/PointerBarrier.h

launcher/SoftwareCenterLauncherIcon.h

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

panel/PanelController.cpp

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelTitlebarGrabAreaView.cpp

panel/PanelTitlebarGrabAreaView.h

panel/PanelTray.cpp

panel/PanelTray.h

panel/PanelView.cpp

panel/PanelView.h

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

shortcuts/ShortcutController.cpp

shortcuts/ShortcutController.h

tests/CMakeLists.txt

tests/test_bamflaunchericon.cpp

tests/test_glib_source.cpp

tests/test_switcher_controller.cpp

unity-shared/Animator.cpp

unity-shared/Animator.h

unity-shared/BGHash.cpp

unity-shared/BGHash.h

unity-shared/IconLoader.cpp

unity-shared/IconLoader.h

unity-shared/SearchBar.cpp

unity-shared/SearchBar.h

unity-shared/SearchBarSpinner.cpp

unity-shared/SearchBarSpinner.h

unity-shared/UScreen.cpp

unity-shared/UScreen.h

Older »