diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-08-18 05:10:57 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-08-18 05:10:57 (GMT) |
| commit | 2da72a2000cd4d7e1ffdb559170e73b281f96449 (patch) | |
| tree | 33851369544b241b4f50a4f610ee7111f88363cf /doc/src/declarative/pics | |
| parent | 372807a6e0a70bb39892fc9957967027465341a9 (diff) | |
| parent | ccd11ebe69f0f7088d2b1de2c372326a4f543827 (diff) | |
| download | Qt-2da72a2000cd4d7e1ffdb559170e73b281f96449.zip Qt-2da72a2000cd4d7e1ffdb559170e73b281f96449.tar.gz Qt-2da72a2000cd4d7e1ffdb559170e73b281f96449.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxpositioners.cpp
Diffstat (limited to 'doc/src/declarative/pics')
0 files changed, 0 insertions, 0 deletions