Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2
authorBeaver Xu <xtfllbl@hotmail.com>
Wed, 6 Apr 2011 05:29:32 +0000 (13:29 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Wed, 6 Apr 2011 05:29:32 +0000 (13:29 +0800)
commit7ad5f9708f69fb957ac7a79c47d75a9c2a6a86a4
treee77c397f34e419957c84626926f666f677ac9007
parentb7b465a2a55e1b1648019362440f854d360ee751
parentcfdbd3ca9a97f8ebb764c0403a1c25c0e46250ca
Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2