diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 08:02:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 08:02:05 (GMT) |
| commit | aa596c177d733d806f2d4c415d6e679d9ab56c03 (patch) | |
| tree | 48ebac3bcc23e85970a89da07fea1820fc95dce1 /src/3rdparty/Makefile | |
| parent | 473da75ed84651c70ae0d10e23f09e1a0e4ae799 (diff) | |
| parent | 780f0cf58d93babd4bbfb5d3d00156a96fc7dacb (diff) | |
| download | Qt-aa596c177d733d806f2d4c415d6e679d9ab56c03.zip Qt-aa596c177d733d806f2d4c415d6e679d9ab56c03.tar.gz Qt-aa596c177d733d806f2d4c415d6e679d9ab56c03.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Export QGLContextResource for use with Qt/3D
Use QSKIP rather than commenting a failure.
Diffstat (limited to 'src/3rdparty/Makefile')
0 files changed, 0 insertions, 0 deletions