Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1
authorBeaver Xu <xtfllbl@hotmail.com>
Mon, 24 Jan 2011 03:22:44 +0000 (11:22 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Mon, 24 Jan 2011 03:22:44 +0000 (11:22 +0800)
commit4a3c059e1dcb9bff60ede935e1f6b7cb36a1abd0
treeea7cebfeeae83aeda0610610046846b905873e70
parent162cc1feb1e9e13c8931360db0786f301b197390
parenta5b5e06f1967841bc36daa93a183ec527e5455e4
Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator into 2.1