← Back to branch summary

~smspillaz/unity/unity.6.0.fix_1036521

~smspillaz/unity/unity.6.0.fix_1036521

Viewing all changes in revision 2562.1.18.

Committer: Ugo Riboni
Date: 2012-08-31 09:15:33 UTC
mfrom: (2644 unity)
mto: This revision was merged to the branch mainline in revision 2647.
Revision ID: ugo.riboni@canonical.com-20120831091533-60o9ph7zhfxxi6md

Merge changes from trunk

files added:
launcher/DeviceNotificationDisplay.h

launcher/DeviceNotificationDisplayImp.cpp

launcher/DeviceNotificationDisplayImp.h

launcher/DevicesSettingsImp.h

launcher/FileManagerOpener.h

launcher/FileManagerOpenerImp.cpp

launcher/FileManagerOpenerImp.h

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

tests/autopilot/unity/tests/xim

tests/autopilot/unity/tests/xim/__init__.py

tests/autopilot/unity/tests/xim/test_gcin.py

tests/gmockmount.c

tests/gmockmount.h

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

files renamed:
launcher/DevicesSettings.cpp => launcher/DevicesSettingsImp.cpp

launcher/DeviceLauncherIcon.cpp => launcher/VolumeLauncherIcon.cpp

launcher/DeviceLauncherIcon.h => launcher/VolumeLauncherIcon.h

files modified:
CMakeLists.txt

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

UnityCore/Lens.cpp

UnityCore/Lens.h

UnityCore/Variant.cpp

UnityCore/Variant.h

com.canonical.Unity.gschema.xml

dash/LensView.cpp

dash/LensView.h

dash/previews/ApplicationPreview.cpp

dash/previews/PreviewInfoHintWidget.cpp

launcher/AbstractVolumeMonitorWrapper.h

launcher/CMakeLists.txt

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/DevicesSettings.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

manual-tests/Launcher.txt

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/unityshell.xml.in

po/POTFILES.in

tests/CMakeLists.txt

tests/gmockvolume.c

tests/gmockvolume.h

tests/test_device_launcher_section.cpp

tests/test_launcher_controller.cpp

unity-shared/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

UnityCore/Lens.cpp

UnityCore/Lens.h

UnityCore/Variant.cpp

UnityCore/Variant.h

com.canonical.Unity.gschema.xml

dash/LensView.cpp

dash/LensView.h

dash/previews/ApplicationPreview.cpp

dash/previews/PreviewInfoHintWidget.cpp

launcher/AbstractVolumeMonitorWrapper.h

launcher/CMakeLists.txt

launcher/DeviceLauncherSection.cpp

launcher/DeviceLauncherSection.h

launcher/DeviceNotificationDisplay.h

launcher/DeviceNotificationDisplayImp.cpp

launcher/DeviceNotificationDisplayImp.h

launcher/DevicesSettings.h

launcher/DevicesSettingsImp.cpp

launcher/DevicesSettingsImp.h

launcher/FileManagerOpener.h

launcher/FileManagerOpenerImp.cpp

launcher/FileManagerOpenerImp.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherControllerPrivate.h

launcher/Volume.h

launcher/VolumeImp.cpp

launcher/VolumeImp.h

launcher/VolumeLauncherIcon.cpp

launcher/VolumeLauncherIcon.h

manual-tests/Launcher.txt

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/unityshell.xml.in

tests/CMakeLists.txt

tests/autopilot/unity/tests/xim/

tests/autopilot/unity/tests/xim/__init__.py

tests/autopilot/unity/tests/xim/test_gcin.py

tests/gmockmount.c

tests/gmockmount.h

tests/gmockvolume.c

tests/gmockvolume.h

tests/test_device_launcher_section.cpp

tests/test_launcher_controller.cpp

tests/test_volume_imp.cpp

tests/test_volume_launcher_icon.cpp

unity-shared/CMakeLists.txt

Older »