diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2017-05-05 09:35:22 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2017-05-05 09:35:22 +0800 |
| commit | 694c76f5c12fe533db00568dbea4b5cfc00e2d5f (patch) | |
| tree | af927790745a20197105cb4d2cf001cb16470c78 /builtin/merge-file.c | |
| parent | 4fa66c85f11bc5a541462ca5ae3246aa0ce02e74 (diff) | |
| parent | 87cb7997f79d4f7a2b87efab27e0715446e2811c (diff) | |
| download | git-694c76f5c12fe533db00568dbea4b5cfc00e2d5f.tar.gz git-694c76f5c12fe533db00568dbea4b5cfc00e2d5f.tar.xz | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: zh_CN: for git v2.13.0 l10n round 1
l10n: fr.po v2.13 round 1
l10n: pt_PT: update Portuguese translation
l10n: bg.po: Updated Bulgarian translation (3201t)
l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
l10n: sv.po: Update Swedish translation (3199t0f0u)
l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions