summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-05-28 22:54:20 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-05-28 22:55:16 (GMT)
commit9088aeae9daf02546769377853824397458ba822 (patch)
tree0ecfd5bc28e7e825f03e0a4f187cacf14ef26302 /src/corelib/plugin
parent47f12341450ad5a03f714340fb2b213be0126a8c (diff)
downloadQt-9088aeae9daf02546769377853824397458ba822.zip
Qt-9088aeae9daf02546769377853824397458ba822.tar.gz
Qt-9088aeae9daf02546769377853824397458ba822.tar.bz2
Fixed compile of Qt/Embedded.
Fix what looks like the result of a `git merge' gone wrong.
Diffstat (limited to 'src/corelib/plugin')
0 files changed, 0 insertions, 0 deletions