diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
| commit | 97930918c8f5d20c6a27c22a1f0670ac7576c17a (patch) | |
| tree | 688f93eacf376df07679f06203834e44143103fa /src/3rdparty/libjpeg/makejdsw.vc6 | |
| parent | 80fc5bf17e5f049a395d6a5612843c69c5b0fde1 (diff) | |
| parent | 66818ea9bc50af50bb26515cf667fe1c0c62a12d (diff) | |
| download | Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.zip Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.gz Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.bz2 | |
Merge remote branch 'origin/master' into qtruntime
Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h
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> +{{{ +}}} + +############################################################################### + |