diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 13:48:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 13:48:44 (GMT) |
| commit | afd7cfce7333635edc8d3637f81cc9c3023ee874 (patch) | |
| tree | 433345bd8cfd4a2c057a24ee3c906d274d6282ca /src/corelib/io/qabstractfileengine.h | |
| parent | 044680951401487590c0ed554092dd9b7e0ee783 (diff) | |
| parent | 3513c1a01b319fb5fd4057be306c9f9506f8223d (diff) | |
| download | Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.zip Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.tar.gz Qt-afd7cfce7333635edc8d3637f81cc9c3023ee874.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60
Conflicts:
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/plugin/qlibrary.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
Diffstat (limited to 'src/corelib/io/qabstractfileengine.h')
0 files changed, 0 insertions, 0 deletions