Viewing all changes in revision 94.2.3.
- Committer: Alexandre Abreu
- Date: 2014-01-14 19:59:31 UTC
- mfrom: (101 trunk)
- mto: This revision was merged to the branch mainline in revision 104.
- Revision ID: alexandre.abreu@canonical.com-20140114195931-dgqldhqm5fha5hs8
merge trunk
- files added:
- 0.1/ambiance/css/option-selector.css
- examples
- examples/container
- examples/container/simple
- examples/container/simple/www
- examples/container/simple/www/css
- examples/container/simple/www/img
- examples/html5-theme
- src
- src/ubuntu-html5-app-launcher
- src/ubuntu-html5-container-qml
- src/ubuntu-html5-container-qml/Ubuntu
- src/ubuntu-html5-container-qml/Ubuntu/WebApps
- files removed:
- 0.1/examples
- files renamed:
- 0.1/examples/apps/ => examples/html5-theme/apps/
- 0.1/examples/ubuntu-html5-ui-gallery.desktop => examples/html5-theme/ubuntu-html5-ui-gallery.desktop
- 0.1/examples/ui-gallery/ => examples/html5-theme/ui-gallery/
- 0.1/examples/widgets/ => examples/html5-theme/widgets/
- files modified:
- .bzrignore
expand all
collapse all
added
removed
0.1/ambiance/img/back@18.png
0.1/ambiance/img/chevron@27.png
0.1/ambiance/img/chevron_down@30.png
0.1/ambiance/img/tick@30.png
examples/container/simple/www/img/logo.png
