« back to all changes in this revision
Viewing changes to shell/app/shelldeclarativeview.cpp
- Committer: Ugo Riboni
- Date: 2011-11-25 16:56:32 UTC
- mfrom: (771.3.70 unity-2d-tv)
- mto: (818.2.1 santon)
- mto: This revision was merged to the branch mainline in revision 819.
- Revision ID: ugo.riboni@canonical.com-20111125165632-9gwboejah5hhboyl
Merge changes from the upstream shell working branch
- files removed:
- shell/qml
- files renamed:
- shell/qml/Shell.qml => shell/Shell.qml
- shell/qml/dash/ => shell/dash/
- shell/artwork/dash/ => shell/dash/artwork/
- shell/qml/launcher/ => shell/launcher/
- shell/artwork/launcher/ => shell/launcher/artwork/
- shell/qml/player/ => shell/player/
- shell/qml/utils.js => shell/utils.js
- files modified:
- debian/unity-2d-shell.install.in
added
removed
shell/app/shelldeclarativeview.cpp
