diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 11:53:07 (GMT) |
| commit | 15b08dffc1354bc816b04901a7442679382b0935 (patch) | |
| tree | 783af85b75f9de3ab10902c5ba66cf5e22b2fe61 /doc/src/declarative/pics/spacing_a.png | |
| parent | 9f5b02406f38fe02a27de7843b9f8a11232d2064 (diff) | |
| parent | 9d174f13e48730ac06aa429e0f011a02b333025e (diff) | |
| download | Qt-15b08dffc1354bc816b04901a7442679382b0935.zip Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.gz Qt-15b08dffc1354bc816b04901a7442679382b0935.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
Diffstat (limited to 'doc/src/declarative/pics/spacing_a.png')
| -rw-r--r-- | doc/src/declarative/pics/spacing_a.png | bin | 0 -> 547 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/declarative/pics/spacing_a.png b/doc/src/declarative/pics/spacing_a.png Binary files differnew file mode 100644 index 0000000..c0fe895 --- /dev/null +++ b/doc/src/declarative/pics/spacing_a.png |