Merge branch '2.1' of git@gitorious.org:~shiroki/qt-creator/qt-creator-zh_cn.git...
authorqpsoft <support@qpsoft.com>
Sat, 8 Jan 2011 02:11:07 +0000 (10:11 +0800)
committerqpsoft <support@qpsoft.com>
Sat, 8 Jan 2011 02:11:07 +0000 (10:11 +0800)
commit0c9a9545d0fb9b6d1d9767cfd8075d9d4961fba0
tree8653e88c6beec5623973d07592a2b709a2fc0efe
parent740ae11ab5fb3fb16a6c9d2db7fd2d4d14ea379b
parentff355e08cfeefe4d171883426adf7a5ad536a561
Merge branch '2.1' of git@gitorious.org:~shiroki/qt-creator/qt-creator-zh_cn.git into zh_cn_2.1_my