summaryrefslogtreecommitdiffstats
path: root/tools/assistant/lib/qhelpengine.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-12 14:00:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-12 14:00:36 (GMT)
commitd888b168932fbdc65881ced1aa55165f286ea6d2 (patch)
tree0e24b77785255d4dff8f6a8545c5b373d67449c4 /tools/assistant/lib/qhelpengine.h
parentb089db709ba5e97b444db13a86b7fe2f4f063348 (diff)
parenta53e579a388c6bca6374b56328622bc8c1e0f138 (diff)
downloadQt-d888b168932fbdc65881ced1aa55165f286ea6d2.zip
Qt-d888b168932fbdc65881ced1aa55165f286ea6d2.tar.gz
Qt-d888b168932fbdc65881ced1aa55165f286ea6d2.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Mac: pixmaps dont treat alpha exactly the same as other platforms
Diffstat (limited to 'tools/assistant/lib/qhelpengine.h')
0 files changed, 0 insertions, 0 deletions