diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:13:54 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:13:54 (GMT) |
| commit | d758080a6c345abec5e06a36ed26a2757a53c65f (patch) | |
| tree | 8cb37f0d10ce187bb2e30b91adbb117c3671b672 /examples/declarative | |
| parent | 79f58df5b28dca88a4359ea9a76325e1a4a7f4e5 (diff) | |
| parent | f2b93868f48a3e2d6e462ca8a051ab47eefef49d (diff) | |
| download | Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.zip Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.tar.gz Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.tar.bz2 | |
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts:
doc/src/qnamespace.qdoc
src/gui/painting/qdrawutil.cpp
Diffstat (limited to 'examples/declarative')
0 files changed, 0 insertions, 0 deletions