← Back to branch summary

~brandontschaefer/unity/bump-to-new-nux-abi

~brandontschaefer/unity/bump-to-new-nux-abi

Viewing all changes in revision 3806.11.12.

Committer: Marco Trevisan (Treviño)
Date: 2014-06-18 15:08:33 UTC
mfrom: (3823 unity)
mto: This revision was merged to the branch mainline in revision 3828.
Revision ID: mail@3v1n0.net-20140618150833-zi8p6idcw1gbyj99

Merging with trunk

files added:
resources/launcher_icon_glow_62.png

tests/test-gestures/LockScreenControllerMock.h

files renamed:
resources/launcher_icon_glow_62.svg => resources/launcher_icon_glow_62.svg.save

files modified:
dash/DashController.cpp

debian/changelog

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/TrashLauncherIcon.cpp

launcher/VolumeLauncherIcon.cpp

lockscreen/LockScreenAbstractShield.h

lockscreen/LockScreenController.cpp

lockscreen/LockScreenShield.cpp

lockscreen/LockScreenShield.h

lockscreen/UserPromptView.cpp

lockscreen/UserPromptView.h

panel/PanelIndicatorEntryView.cpp

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

plugins/unityshell/src/unityshell.cpp

po/POTFILES.in

shortcuts/ShortcutController.cpp

shortcuts/ShortcutView.cpp

shortcuts/ShortcutView.h

tests/test-gestures/sed_script_switcher

tests/test-gestures/unityshell_mock.h

tests/test_lockscreen_controller.cpp

tests/test_switcher_view.cpp

unity-shared/IMTextEntry.cpp

unity-shared/IMTextEntry.h

unity-shared/PluginAdapter.cpp

unity-shared/TextInput.cpp

unity-shared/TextInput.h

Show diffs side-by-side

added added

removed removed

dash/DashController.cpp

debian/changelog

hud/HudController.cpp

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

launcher/TrashLauncherIcon.cpp

launcher/VolumeLauncherIcon.cpp

lockscreen/LockScreenAbstractShield.h

lockscreen/LockScreenController.cpp

lockscreen/LockScreenShield.cpp

lockscreen/LockScreenShield.h

lockscreen/UserPromptView.cpp

lockscreen/UserPromptView.h

panel/PanelIndicatorEntryView.cpp

plugins/unityshell/src/GesturalWindowSwitcher.cpp

plugins/unityshell/src/GesturalWindowSwitcher.h

plugins/unityshell/src/unityshell.cpp

resources/launcher_icon_glow_62.png

shortcuts/ShortcutController.cpp

shortcuts/ShortcutView.cpp

shortcuts/ShortcutView.h

tests/test-gestures/LockScreenControllerMock.h

tests/test-gestures/sed_script_switcher

tests/test-gestures/unityshell_mock.h

tests/test_lockscreen_controller.cpp

tests/test_switcher_view.cpp

unity-shared/IMTextEntry.cpp

unity-shared/IMTextEntry.h

unity-shared/PluginAdapter.cpp

unity-shared/TextInput.cpp

unity-shared/TextInput.h

Older »