diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2012-05-12 15:01:22 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-05-12 15:01:22 +0800 |
| commit | b652ada42a76548569a0dc9c9cf356343f9e1c3a (patch) | |
| tree | 986a200acfce7290c0b556eaa6583f1eae9e29db /ws.c | |
| parent | Merge branch 'maint' into master (diff) | |
| parent | l10n: zh_CN.po: translate 1 new message (diff) | |
| download | tgif-b652ada42a76548569a0dc9c9cf356343f9e1c3a.tar.xz | |
Merge branch 'maint'
* maint:
l10n: zh_CN.po: translate 1 new message
Conflicts:
po/zh_CN.po
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions