Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.1
authorBeaver Xu <xtfllbl@hotmail.com>
Wed, 30 Mar 2011 01:06:31 +0000 (09:06 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Wed, 30 Mar 2011 01:06:31 +0000 (09:06 +0800)
commit09dec7ae22992ada569b6119e6d605c0cbd96a1e
treefe8cac2e9d4891dc209ab1b0a572868c9cc4bf1a
parent4f8af3d6c3c263fe3e164b050f851fbe434c332e
parentebed1ef30620b3b30f9c7b0dd9fd52a025753d2d
Merge branch '2.2' of git://gitorious.org/qt-creator/qt-creator into 2.1
share/qtcreator/translations/qtcreator_zh_CN.ts