diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:14:58 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:14:58 (GMT) |
| commit | 815eb1c4793ffc9d11ec160996350610deb4db7d (patch) | |
| tree | fe24c022bc2411023f873da882e4fc1b599471c2 /src/3rdparty/phonon/COPYING.LIB | |
| parent | 446085a8b3f22d7e2735b62b4511907e7aaba82a (diff) | |
| parent | 96e13b0411ed3f4ef8753edafc41503fc9aceb0f (diff) | |
| download | Qt-815eb1c4793ffc9d11ec160996350610deb4db7d.zip Qt-815eb1c4793ffc9d11ec160996350610deb4db7d.tar.gz Qt-815eb1c4793ffc9d11ec160996350610deb4db7d.tar.bz2 | |
Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api
Conflicts:
src/gui/math3d/math3d.pri
src/gui/math3d/qgenericmatrix.cpp
src/gui/math3d/qgenericmatrix.h
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
src/gui/math3d/qquaternion.cpp
src/gui/math3d/qquaternion.h
src/gui/math3d/qvector2d.cpp
src/gui/math3d/qvector2d.h
src/gui/math3d/qvector3d.cpp
src/gui/math3d/qvector3d.h
src/gui/math3d/qvector4d.cpp
src/gui/math3d/qvector4d.h
src/opengl/opengl.pro
tests/auto/math3d/math3d.pro
tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
tests/auto/math3d/qquaternion/tst_qquaternion.cpp
tests/auto/math3d/qvectornd/tst_qvectornd.cpp
tests/auto/math3d/shared/math3dincludes.h
Diffstat (limited to 'src/3rdparty/phonon/COPYING.LIB')
0 files changed, 0 insertions, 0 deletions