Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1
authorBeaver Xu <xtfllbl@hotmail.com>
Mon, 27 Dec 2010 07:27:22 +0000 (15:27 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Mon, 27 Dec 2010 07:27:22 +0000 (15:27 +0800)
commit162cc1feb1e9e13c8931360db0786f301b197390
tree11caa57b082c5177cfac4466a184a40939a17851
parent77c2ddc386d2eff0d3dfc9da46841ff5e716cc2d
parent7864ddcb28e04b842d6a69e64b7e25dd40f19aa7
Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1