← Back to branch summary

~saviq/+junk/shell-refactor-screeninfo

~saviq/+junk/shell-refactor-screeninfo

Viewing all changes in revision 766.1.6.

Committer: LDS
Date: 2011-11-29 17:36:45 UTC
mfrom: (771.2.27 unity-2d)
mto: (771.2.28 unity-2d)
mto: This revision was merged to the branch mainline in revision 856.
Revision ID: lohith.shivamurthy@canonical.com-20111129173645-ibcp5a666wv27o4j

merge conflicts resolved

files added:
libunity-2d-private/src/dashsettings.cpp

libunity-2d-private/src/dashsettings.h

files removed:
places/artwork/fullscreen_button.png

files modified:
libunity-2d-private/Unity2d/GnomeBackground.qml

libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

libunity-2d-private/src/panelstyle.cpp

libunity-2d-private/src/panelstyle.h

panel/applets/appname/appnameapplet.cpp

panel/applets/appname/windowhelper.cpp

panel/applets/appname/windowhelper.h

places/app/dashdeclarativeview.cpp

places/app/places.cpp

places/dash.qml

spread/Windows.qml

spread/Workspace.qml

spread/Workspaces.qml

Show diffs side-by-side

added added

removed removed

libunity-2d-private/Unity2d/GnomeBackground.qml

libunity-2d-private/Unity2d/plugin.cpp

libunity-2d-private/src/CMakeLists.txt

libunity-2d-private/src/dashsettings.cpp

libunity-2d-private/src/dashsettings.h

libunity-2d-private/src/panelstyle.cpp

libunity-2d-private/src/panelstyle.h

panel/applets/appname/appnameapplet.cpp

panel/applets/appname/windowhelper.cpp

panel/applets/appname/windowhelper.h

places/app/dashdeclarativeview.cpp

places/app/places.cpp

places/artwork/fullscreen_button.png

places/dash.qml

spread/Windows.qml

spread/Workspace.qml

spread/Workspaces.qml

Older »