diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 15:53:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 15:53:49 (GMT) |
| commit | db14623485396fd69839e519184b794775b65b01 (patch) | |
| tree | c57e705daf03ee117180bd08b958d41491052bb3 /src/opengl/qglpixelbuffer.cpp | |
| parent | 98824c2ebe97f61bf294b0be07ac164aed470fbf (diff) | |
| parent | 2b5291639cd67e1a251c2fcc3e4d449ac74db1ab (diff) | |
| download | Qt-db14623485396fd69839e519184b794775b65b01.zip Qt-db14623485396fd69839e519184b794775b65b01.tar.gz Qt-db14623485396fd69839e519184b794775b65b01.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove accidentially committed .qmlproject.user file, ignore this filetype
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions