diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-28 12:58:46 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-28 13:45:59 +0200 |
| commit | 7eba68adc4a7862d9474179592e5c8393a7acdbb (patch) | |
| tree | 73014cabc8b10f46203844aeb40de574d97032dc /configure.exe | |
| parent | a20f8dcbeafa34b50ef69d1c5db0f17b09731d2a (diff) | |
| parent | 3bf3981c7026de9017887d08312391b54fe8afc6 (diff) | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'configure.exe')
| -rwxr-xr-x | configure.exe | bin | 864256 -> 1160192 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 0a0d1219b1..1019167046 100755 --- a/configure.exe +++ b/configure.exe |