← Back to branch summary

~didrocks/unity/launcher-bug-fix-fest

~didrocks/unity/launcher-bug-fix-fest

Viewing all changes in revision 950.4.8.

Committer: Mirco Müller
Date: 2011-03-22 16:04:22 UTC
mfrom: (992 unity)
mto: This revision was merged to the branch mainline in revision 1003.
Revision ID: mirco.mueller@ubuntu.com-20110322160422-wn5wzgc47o8p53l3

Re-merge again with unity trunk...

files added:
po/unity.pot

services/panel-marshal.list

src/DevicesSettings.cpp

src/DevicesSettings.h

src/GeisAdapter.cpp

src/GeisAdapter.h

src/GestureEngine.cpp

src/GestureEngine.h

src/LauncherHideMachine.cpp

src/LauncherHideMachine.h

files removed:
po/unity.pot

files modified:
CMakeLists.txt

com.canonical.Unity.gschema.xml

po/POTFILES.in

resources/round_glow_hl_62x62.png

services/CMakeLists.txt

services/panel-a11y.c

services/panel-indicator-accessible.c

services/panel-indicator-entry-accessible.c

services/panel-main.c

services/panel-service.c

services/panel-service.h

src/BamfLauncherIcon.cpp

src/DeviceLauncherIcon.cpp

src/DeviceLauncherIcon.h

src/DeviceLauncherSection.cpp

src/DeviceLauncherSection.h

src/FavoriteStoreGSettings.cpp

src/IconTexture.cpp

src/IconTexture.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectEntryProxyRemote.h

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/IndicatorObjectProxyRemote.cpp

src/Launcher.cpp

src/Launcher.h

src/LauncherController.cpp

src/LauncherController.h

src/PanelHomeButton.cpp

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PanelTitlebarGrabAreaView.cpp

src/PanelTitlebarGrabAreaView.h

src/PanelView.cpp

src/PanelView.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlaceLauncherIcon.cpp

src/PlacesController.cpp

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesGroupController.cpp

src/PlacesGroupController.h

src/PlacesHomeView.cpp

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesSettings.cpp

src/PlacesSettings.h

src/PlacesSimpleTile.cpp

src/PlacesTile.cpp

src/PlacesView.cpp

src/PlacesView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/QuicklistView.cpp

src/UBusMessages.h

src/WindowManager.cpp

src/WindowManager.h

src/nux-layout-accessible.cpp

src/nux-view-accessible.cpp

src/unity-root-accessible.cpp

src/unity-util-accessible.cpp

src/unity-util-accessible.h

src/unitya11y.cpp

src/unitya11y.h

src/unitya11ytests.cpp

src/unityshell.cpp

src/unityshell.h

tests/CMakeLists.txt

tests/TestPlaces.cpp

tools/migrate_favorites.py

tools/unity.cmake

unityshell.xml.in

Show diffs side-by-side

added added

removed removed

com.canonical.Unity.gschema.xml

resources/round_glow_hl_62x62.png

services/CMakeLists.txt

services/panel-indicator-accessible.c

services/panel-indicator-entry-accessible.c

services/panel-main.c

services/panel-marshal.list

services/panel-service.c

services/panel-service.h

src/BamfLauncherIcon.cpp

src/DeviceLauncherIcon.cpp

src/DeviceLauncherIcon.h

src/DeviceLauncherSection.cpp

src/DeviceLauncherSection.h

src/DevicesSettings.cpp

src/DevicesSettings.h

src/FavoriteStoreGSettings.cpp

src/GeisAdapter.cpp

src/GeisAdapter.h

src/GestureEngine.cpp

src/GestureEngine.h

src/IconTexture.cpp

src/IconTexture.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectEntryProxyRemote.h

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/IndicatorObjectProxyRemote.cpp

src/Launcher.cpp

src/LauncherController.cpp

src/LauncherController.h

src/LauncherHideMachine.cpp

src/LauncherHideMachine.h

src/PanelHomeButton.cpp

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PanelTitlebarGrabAreaView.cpp

src/PanelTitlebarGrabAreaView.h

src/PanelView.cpp

src/PanelView.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlaceLauncherIcon.cpp

src/PlacesController.cpp

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesGroupController.cpp

src/PlacesGroupController.h

src/PlacesHomeView.cpp

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesSettings.cpp

src/PlacesSettings.h

src/PlacesSimpleTile.cpp

src/PlacesTile.cpp

src/PlacesView.cpp

src/PlacesView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/QuicklistView.cpp

src/UBusMessages.h

src/WindowManager.cpp

src/WindowManager.h

src/nux-layout-accessible.cpp

src/nux-view-accessible.cpp

src/unity-root-accessible.cpp

src/unity-util-accessible.cpp

src/unity-util-accessible.h

src/unitya11y.cpp

src/unitya11y.h

src/unitya11ytests.cpp

src/unityshell.cpp

src/unityshell.h

tests/CMakeLists.txt

tests/TestPlaces.cpp

tools/migrate_favorites.py

tools/unity.cmake

unityshell.xml.in

Older »