← Back to branch summary

~3v1n0/unity/panel-p-cleanup

~3v1n0/unity/panel-p-cleanup

Viewing all changes in revision 2122.

Committer: Marco Trevisan (Treviño)
Date: 2012-04-05 16:10:46 UTC
mfrom: (1858.321.36 unity)
Revision ID: mail@3v1n0.net-20120405161046-jkckmfeoyl8mx8xq

Merging with trunk, resolving conflicts

files added:
plugins/unityshell/src/EdgeBarrierController.cpp

plugins/unityshell/src/EdgeBarrierController.h

files modified:
UnityCore/Hud.cpp

plugins/unityshell/src/BackgroundEffectHelper.cpp

plugins/unityshell/src/BackgroundEffectHelper.h

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IMTextEntry.cpp

plugins/unityshell/src/IMTextEntry.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LensBar.cpp

plugins/unityshell/src/LensBar.h

plugins/unityshell/src/LensView.cpp

plugins/unityshell/src/LensView.h

plugins/unityshell/src/OverlayRenderer.cpp

plugins/unityshell/src/PanelView.cpp

plugins/unityshell/src/PlacesGroup.cpp

plugins/unityshell/src/PointerBarrier.cpp

plugins/unityshell/src/PointerBarrier.h

plugins/unityshell/src/ResultRendererHorizontalTile.cpp

plugins/unityshell/src/ResultRendererHorizontalTile.h

plugins/unityshell/src/ResultRendererTile.cpp

plugins/unityshell/src/ResultRendererTile.h

plugins/unityshell/src/ResultViewGrid.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/SearchBar.cpp

plugins/unityshell/src/SearchBar.h

plugins/unityshell/src/ShortcutHint.cpp

plugins/unityshell/src/ShortcutHintPrivate.cpp

plugins/unityshell/src/ShortcutHintPrivate.h

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

standalone-clients/CMakeLists.txt

tests/autopilot/autopilot/keybindings.py

tests/autopilot/autopilot/tests/__init__.py

tests/autopilot/autopilot/tests/test_command_lens.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_ibus.py

tests/autopilot/autopilot/tests/test_launcher.py

Show diffs side-by-side

added added

removed removed

UnityCore/Hud.cpp

plugins/unityshell/src/BackgroundEffectHelper.cpp

plugins/unityshell/src/BackgroundEffectHelper.h

plugins/unityshell/src/DashView.cpp

plugins/unityshell/src/EdgeBarrierController.cpp

plugins/unityshell/src/EdgeBarrierController.h

plugins/unityshell/src/HudView.cpp

plugins/unityshell/src/HudView.h

plugins/unityshell/src/IMTextEntry.cpp

plugins/unityshell/src/IMTextEntry.h

plugins/unityshell/src/Launcher.cpp

plugins/unityshell/src/Launcher.h

plugins/unityshell/src/LauncherController.cpp

plugins/unityshell/src/LensBar.cpp

plugins/unityshell/src/LensBar.h

plugins/unityshell/src/LensView.cpp

plugins/unityshell/src/LensView.h

plugins/unityshell/src/OverlayRenderer.cpp

plugins/unityshell/src/PanelView.cpp

plugins/unityshell/src/PlacesGroup.cpp

plugins/unityshell/src/PointerBarrier.cpp

plugins/unityshell/src/PointerBarrier.h

plugins/unityshell/src/ResultRendererHorizontalTile.cpp

plugins/unityshell/src/ResultRendererHorizontalTile.h

plugins/unityshell/src/ResultRendererTile.cpp

plugins/unityshell/src/ResultRendererTile.h

plugins/unityshell/src/ResultViewGrid.cpp

plugins/unityshell/src/ScreenEffectFramebufferObject.cpp

plugins/unityshell/src/SearchBar.cpp

plugins/unityshell/src/SearchBar.h

plugins/unityshell/src/ShortcutHint.cpp

plugins/unityshell/src/ShortcutHintPrivate.cpp

plugins/unityshell/src/ShortcutHintPrivate.h

plugins/unityshell/src/ShortcutView.cpp

plugins/unityshell/src/ShortcutView.h

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

standalone-clients/CMakeLists.txt

tests/autopilot/autopilot/keybindings.py

tests/autopilot/autopilot/tests/__init__.py

tests/autopilot/autopilot/tests/test_command_lens.py

tests/autopilot/autopilot/tests/test_hud.py

tests/autopilot/autopilot/tests/test_ibus.py

tests/autopilot/autopilot/tests/test_launcher.py

Older »