diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
| commit | 55123a9b94eb38a372a2d285b25c58085921f233 (patch) | |
| tree | a50e58817060bd31116e4cee684300eaf721ce4f /mkspecs/common/unix.conf | |
| parent | c0c2e556e98ffe550cbedb4e3a0def5dd272ce25 (diff) | |
| parent | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (diff) | |
| download | Qt-55123a9b94eb38a372a2d285b25c58085921f233.zip Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.gz Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'mkspecs/common/unix.conf')
0 files changed, 0 insertions, 0 deletions