diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-24 04:25:07 (GMT) |
| commit | 94d62da58286df177286adcbe688c40629d2c551 (patch) | |
| tree | 773f3b055e77d1947cc4aba6f556630070017848 /doc/src/images | |
| parent | 124f5714e8e6ec1945d536e622b51304f2b32dd7 (diff) | |
| parent | 0570b26f90f031b09970f8fca1a67339b66ee33f (diff) | |
| download | Qt-94d62da58286df177286adcbe688c40629d2c551.zip Qt-94d62da58286df177286adcbe688c40629d2c551.tar.gz Qt-94d62da58286df177286adcbe688c40629d2c551.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/frozencolumn-example.png | bin | 0 -> 41102 bytes |
| -rw-r--r-- | doc/src/images/frozencolumn-tableview.png | bin | 0 -> 22942 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/frozencolumn-example.png b/doc/src/images/frozencolumn-example.png Binary files differnew file mode 100644 index 0000000..66b5c10 --- /dev/null +++ b/doc/src/images/frozencolumn-example.png diff --git a/doc/src/images/frozencolumn-tableview.png b/doc/src/images/frozencolumn-tableview.png Binary files differnew file mode 100644 index 0000000..d829ff5 --- /dev/null +++ b/doc/src/images/frozencolumn-tableview.png |
