Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2
authorBeaver Xu <xtfllbl@hotmail.com>
Thu, 14 Apr 2011 01:00:40 +0000 (09:00 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Thu, 14 Apr 2011 01:00:40 +0000 (09:00 +0800)
commitc5e528aef4889b9bbb9a0d0b675c579cae48c894
treefc4cd58b89f6da584c48048fa82d3cd1a1f95eb6
parent41a3a0d7d62407e066c76ffb758f29c78f3db47f
parent048756a66d492df0924afa72796caa8d292b4627
Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.2