Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2
authorBeaver Xu <xtfllbl@hotmail.com>
Fri, 1 Apr 2011 08:58:45 +0000 (16:58 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Fri, 1 Apr 2011 08:58:45 +0000 (16:58 +0800)
commitd4d76352a2fb91017c3631510a39e583d6165abc
treea4b31068a122911d7efc11cc5abe67d2b89448e7
parent5c4390a8f32a260d4a36822c8bdb3cba863a7cf0
parent47db434addaecd336f6bfc974768a146297d0808
Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2