diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-09-28 06:53:54 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-09-28 06:53:54 +0800 |
| commit | 4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a (patch) | |
| tree | bab029d1cbb04cb5391ddd9f96988c8ac6490b85 /ll-merge.h | |
| parent | 4e0266756d1eccbabed53f27bec6d6a68cdf3efb (diff) | |
| parent | 5b3ba7193f2f99fa1c23c1952f3e0f880e101ae2 (diff) | |
| download | git-4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a.tar.gz git-4d8e8ed8aa130fbd7f51debbd410fd11b5dd811a.tar.xz | |
Merge branch 'maint'
* maint:
l10n: de.po: correct translation of a 'rebase' message
l10n: Improve many translation for zh_CN
l10n: Unify the translation for '(un)expected'
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions