summaryrefslogtreecommitdiffstats
path: root/translations/qvfb_zh_CN.ts
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-05-28 12:06:05 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-05-28 12:06:05 (GMT)
commitf9ca637a41ae2f8f5a5439766073bf19cbc7d9e2 (patch)
tree18e9c28934638bbc59a873bd25d61073ab7393a8 /translations/qvfb_zh_CN.ts
parentdf17b26b40717e35a534e373b2070d37817cb4a3 (diff)
downloadQt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.zip
Qt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.tar.gz
Qt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.tar.bz2
tst_qtextcodec: Fix broken merge conflict resolution
Diffstat (limited to 'translations/qvfb_zh_CN.ts')
0 files changed, 0 insertions, 0 deletions