Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1
authorshiroki <shiroki@cuteqt.com>
Wed, 20 Oct 2010 12:46:54 +0000 (14:46 +0200)
committershiroki <shiroki@cuteqt.com>
Wed, 20 Oct 2010 12:46:54 +0000 (14:46 +0200)
commit8d0b40a57c38a4075163a45a46b901e1ba0ceb46
tree63a64c268ff6908f464c06d4d62abf030558f340
parentd7331440fd263531dda697fd45d51fe4be3b69ef
parent3938cd671b3494b419e564d1563592942ec4d0a7
Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1