Merge commit 'refs/merge-requests/1' of git://gitorious.org/+qt-iphone/qt/qt-iphone...
authorMark Kromis <greybird@AtomicDeath.local>
Tue, 6 Jul 2010 05:14:16 +0000 (01:14 -0400)
committerMark Kromis <greybird@AtomicDeath.local>
Tue, 6 Jul 2010 05:14:16 +0000 (01:14 -0400)
commit3304b8db0bc9e8664fa0805ffc01d66551b339f5
tree5f8f4b4782f77586579d7d4384661b1294b2d8e6
parent6decd8c7570522feb0321689ebe520f9fdc9e113
parent1931eb9bc7f24acbe905622dbd9be119446576fa
Merge commit 'refs/merge-requests/1' of git://gitorious.org/+qt-iphone/qt/qt-iphone-clone into merge-requests-1

Conflicts:
configure
mkspecs/common/iphone-g++.conf
configure