diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
| commit | 508d1244dc8d38188c70e98207efa8a97d16b47c (patch) | |
| tree | fc8688b80be453755f8135df11bf1db2d247725a /merge-file.h | |
| parent | l10n: fast-forward here is ff-only merge, not push (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.xz | |
Merge branch 'master' into git-po
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions