Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1
authorBeaver Xu <xtfllbl@hotmail.com>
Tue, 21 Dec 2010 05:16:48 +0000 (13:16 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Tue, 21 Dec 2010 05:16:48 +0000 (13:16 +0800)
commit77c2ddc386d2eff0d3dfc9da46841ff5e716cc2d
tree31bbcb441f832643a22aec56e5eb90e15714dbef
parent34185828678a5e07fc96b9070ede29c8cde755d1
parentf57cb8935f2e87fe558d677efd7efaafd6f72dc2
Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1