diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 13:35:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 13:35:58 (GMT) |
commit | 2cda71ec0946f4ce1c983fe518d215c66abd39c4 (patch) | |
tree | 2b02a64bc575a05df5eaf7c8205ba3df4f2448b4 /src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp | |
parent | e053119de55be1747f98d15a7871d5bcba2648b6 (diff) | |
parent | 45180cb6e3d92d7bb6ac22515f6cd00206b6fac8 (diff) | |
download | Qt-2cda71ec0946f4ce1c983fe518d215c66abd39c4.zip Qt-2cda71ec0946f4ce1c983fe518d215c66abd39c4.tar.gz Qt-2cda71ec0946f4ce1c983fe518d215c66abd39c4.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
gdb_dwarf_index: change version constraint from 72 to 73
Revert "Remove gdb_dwarf_index from maemo mkspec"
Line ending fix.
Added mipmap property to QGLFramebufferObjectFormat.
Remove gdb_dwarf_index from maemo mkspec
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerstackwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions