diff options
author | Dan McGee <dan@archlinux.org> | 2009-01-13 00:10:36 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-01-13 00:10:36 -0600 |
commit | b369f71fd62effa611214f5afc3de8568533253a (patch) | |
tree | 720d557f939cc2b23415d21adef6895636c6df18 /po/zh_CN.po | |
parent | 3d6da93093caa12f726f723ba19d737c8a55b44d (diff) | |
parent | 1191303f8b9edc01ff969e2433f5c40c9a95474a (diff) |
Merge branch 'maint'
Conflicts:
doc/makepkg.conf.5.txt
Diffstat (limited to 'po/zh_CN.po')
0 files changed, 0 insertions, 0 deletions