diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:20:44 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 13:20:44 (GMT) |
commit | ce276c42d95f8a7e83da371f33d9da32986a30eb (patch) | |
tree | 7a088008a27c86d5d53a988cf9567244226b3fc4 /src/3rdparty/libjpeg/makejdsw.vc6 | |
parent | d05f83919949fd9604e6d96858a8404c9a580def (diff) | |
parent | 06f96dbdcaeeb82d57b8d1f23cbbd498ddfc88c2 (diff) | |
download | Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.zip Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.tar.gz Qt-ce276c42d95f8a7e83da371f33d9da32986a30eb.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
license doc updated for libtiff 3.9.2
Our configuration and build modifications to libtiff
Add libtiff 3.9.2
Update license doc, .pro file and qjpeghandler for libjpeg 8
Our configuration and build modifications to libjpeg
Add libjpeg 8
Delete libjpeg 6b
Delete libtiff 3.8.2
Diffstat (limited to 'src/3rdparty/libjpeg/makejdsw.vc6')
-rw-r--r-- | src/3rdparty/libjpeg/makejdsw.vc6 | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/makejdsw.vc6 b/src/3rdparty/libjpeg/makejdsw.vc6 new file mode 100644 index 0000000..d11fab1 --- /dev/null +++ b/src/3rdparty/libjpeg/makejdsw.vc6 @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL™SCHT WERDEN! + +############################################################################### + +Project: "jpeg"=".\jpeg.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + |