← Back to branch summary

~katanasov/unity/7.2

~katanasov/unity/7.2

Viewing all changes in revision 3797.

Committer: Kostadin Atanasov
Date: 2014-07-23 17:09:25 UTC
mfrom: (3791.2.9 unity)
Revision ID: pranayama111@gmail.com-20140723170925-y9191ej2aiqpqc11

merge with upstream

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:
AUTHORS

CMakeLists.txt

ChangeLog

UnityCore/GnomeSessionManager.cpp

UnityCore/GnomeSessionManagerImpl.h

UnityCore/SessionManager.h

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

plugins/unityshell/src/unityshell.h

po/POTFILES.in

po/unity.pot

shortcuts/ShortcutController.cpp

shortcuts/ShortcutView.cpp

shortcuts/ShortcutView.h

shutdown/SessionButton.cpp

shutdown/SessionButton.h

shutdown/SessionController.cpp

shutdown/SessionView.cpp

shutdown/SessionView.h

tests/test-gestures/sed_script_switcher

tests/test-gestures/unityshell_mock.h

tests/test_lockscreen_controller.cpp

tests/test_switcher_view.cpp

tests/test_unity_window_view.cpp

unity-shared/EMConverter.cpp

unity-shared/IMTextEntry.cpp

unity-shared/IMTextEntry.h

unity-shared/PluginAdapter.cpp

unity-shared/RawPixel.cpp

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/UnityWindowStyle.cpp

unity-shared/UnityWindowStyle.h

unity-shared/UnityWindowView.cpp

unity-shared/UnityWindowView.h

Show diffs side-by-side

added added

removed removed

UnityCore/GnomeSessionManager.cpp

UnityCore/GnomeSessionManagerImpl.h

UnityCore/SessionManager.h

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

plugins/unityshell/src/unityshell.h

resources/launcher_icon_glow_62.png

shortcuts/ShortcutController.cpp

shortcuts/ShortcutView.cpp

shortcuts/ShortcutView.h

shutdown/SessionButton.cpp

shutdown/SessionButton.h

shutdown/SessionController.cpp

shutdown/SessionView.cpp

shutdown/SessionView.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

tests/test_unity_window_view.cpp

unity-shared/EMConverter.cpp

unity-shared/IMTextEntry.cpp

unity-shared/IMTextEntry.h

unity-shared/PluginAdapter.cpp

unity-shared/RawPixel.cpp

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/UnityWindowStyle.cpp

unity-shared/UnityWindowStyle.h

unity-shared/UnityWindowView.cpp

unity-shared/UnityWindowView.h

Older »