diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
| commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
| tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /doc/src/declarative/pics/qml-gradient.png | |
| parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
| parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'doc/src/declarative/pics/qml-gradient.png')
| -rw-r--r-- | doc/src/declarative/pics/qml-gradient.png | bin | 0 -> 364 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/declarative/pics/qml-gradient.png b/doc/src/declarative/pics/qml-gradient.png Binary files differnew file mode 100644 index 0000000000..5eefdd2031 --- /dev/null +++ b/doc/src/declarative/pics/qml-gradient.png |