summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/plugin.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-01 01:58:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-01 01:58:46 (GMT)
commitdac9e5dd5644d29d6a8dde752e7c594727f16661 (patch)
treeffa9975424aa9f7e198346dce9792093b22dc495 /src/corelib/plugin/plugin.pri
parent0b438841e98add45fbddce51e210aea0c97a1f91 (diff)
parent19198b08a1d5b6f4e6875d93e2647b38e8f11184 (diff)
downloadQt-dac9e5dd5644d29d6a8dde752e7c594727f16661.zip
Qt-dac9e5dd5644d29d6a8dde752e7c594727f16661.tar.gz
Qt-dac9e5dd5644d29d6a8dde752e7c594727f16661.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Some small Solaris fixes.
Diffstat (limited to 'src/corelib/plugin/plugin.pri')
0 files changed, 0 insertions, 0 deletions