Merge branch '2.1' of gitorious.org:~shiroki/qt-creator/qt-creator-zh_cn into 2.1
authorBeaver Xu <xtfllbl@hotmail.com>
Mon, 24 Jan 2011 03:24:36 +0000 (11:24 +0800)
committerBeaver Xu <xtfllbl@hotmail.com>
Mon, 24 Jan 2011 03:24:36 +0000 (11:24 +0800)
commit4f8af3d6c3c263fe3e164b050f851fbe434c332e
tree7a8163b191a78127fdd21e3d0dfc547dbf66756d
parent4a3c059e1dcb9bff60ede935e1f6b7cb36a1abd0
parent0c9a9545d0fb9b6d1d9767cfd8075d9d4961fba0
Merge branch '2.1' of gitorious.org:~shiroki/qt-creator/qt-creator-zh_cn into 2.1