← Back to branch summary

~unity-team/unity/4.0

~unity-team/unity/4.0

Viewing all changes in revision 1736.

Committer: smspillaz
Date: 2012-01-19 08:50:41 UTC
mfrom: (1732.3.3 unity.oneiric)
Revision ID: sam.spilsbury@canonical.com-20120119085041-ou6f0nbjvp52ot3q

Merge lp:unity/4.0

files added:
manual-tests

manual-tests/launcher.txt

files removed:
manual-tests

manual-tests/launcher.txt

files renamed:
manual-tests/QuicklistOnExpo.txt => manual-tests/QuicklistOnExpo.txt

manual-tests/ReadMe.txt => manual-tests/ReadMe.txt

manual-tests/custom-dash-home/ => manual-tests/custom-dash-home/

files modified:
plugins/unityshell/src/JSONParser.cpp

plugins/unityshell/src/JSONParser.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/PlacesHomeView.cpp

plugins/unityshell/src/PlacesHomeView.h

tests/CMakeLists.txt

tests/test-get-transients/CMakeLists.txt

tests/test-input-remover/CMakeLists.txt

tests/test-minimize-window-handler/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

manual-tests/launcher.txt

manual-tests/launcher.txt

plugins/unityshell/src/JSONParser.cpp

plugins/unityshell/src/JSONParser.h

plugins/unityshell/src/LauncherIcon.cpp

plugins/unityshell/src/PlacesHomeView.cpp

plugins/unityshell/src/PlacesHomeView.h

tests/CMakeLists.txt

tests/test-get-transients/CMakeLists.txt

tests/test-input-remover/CMakeLists.txt

tests/test-minimize-window-handler/CMakeLists.txt

Older »