Merge gitorious.org:~ianfromafrica/qt/qt-ios-plaszma into 4.8
authorIan Dean <ian@mediator-software.com>
Fri, 21 Dec 2012 12:31:36 +0000 (14:31 +0200)
committerIan Dean <ian@mediator-software.com>
Fri, 21 Dec 2012 12:31:36 +0000 (14:31 +0200)
commitf839f0a2c251b4ad4ba8dc22af09ac44283b62e2
tree6f6b1590a75b770a0c02a7160f1a6e99d61654bd
parentb4488dd3fa983120f9471884db6ae28111be1d5c
parent016a7dbcc854cee0e4597cfb3f7594c149824d74
Merge gitorious.org:~ianfromafrica/qt/qt-ios-plaszma into 4.8