← Back to branch summary

~unity-team/unity/trunk

~unity-team/unity/trunk

Viewing all changes in revision 854.3.6.

Committer: macslow at bangang
Date: 2011-02-21 13:21:49 UTC
mfrom: (873 unity)
mto: This revision was merged to the branch mainline in revision 875.
Revision ID: macslow@bangang.de-20110221132149-jwv3muizq73cqzcs

Re-merge with unity trunk again... fixed merge-conflicts

files modified:
CMakeLists.txt

services/CMakeLists.txt

src/Launcher.cpp

src/Launcher.h

src/LauncherModel.cpp

src/LauncherModel.h

src/PlaceFactoryFile.cpp

src/PlacesController.cpp

src/PlacesResultsController.cpp

src/PlacesResultsView.cpp

src/PlacesView.cpp

src/unityshell.cpp

tests/CMakeLists.txt

tests/TestPlacesGroup.cpp

tests/TestPlacesResults.cpp

tests/TestPlacesTiles.cpp

Show diffs side-by-side

added added

removed removed

services/CMakeLists.txt

src/Launcher.cpp

src/LauncherModel.cpp

src/LauncherModel.h

src/PlaceFactoryFile.cpp

src/PlacesController.cpp

src/PlacesResultsController.cpp

src/PlacesResultsView.cpp

src/PlacesView.cpp

src/unityshell.cpp

tests/CMakeLists.txt

tests/TestPlacesGroup.cpp

tests/TestPlacesResults.cpp

tests/TestPlacesTiles.cpp

Older »