|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
demos/declarative/webbrowser/WebBrowser.qml
demos/declarative/webbrowser/content/pics/addressbar-filled.png
demos/declarative/webbrowser/content/pics/addressbar.png
demos/declarative/webbrowser/content/pics/back-disabled.png
demos/declarative/webbrowser/content/pics/back.png
demos/declarative/webbrowser/content/pics/footer.png
demos/declarative/webbrowser/content/pics/forward-disabled.png
demos/declarative/webbrowser/content/pics/forward.png
demos/declarative/webbrowser/content/pics/header.png
demos/declarative/webbrowser/content/pics/reload.png
|