diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-21 08:56:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-21 08:56:16 -0800 |
| commit | c3ee2e2c9deb1e7846e864494cdb2fbc7bb1a285 (patch) | |
| tree | b181ce7c89e26ec3340ad83296da4143f0254985 /builtin/merge-index.c | |
| parent | Merge branch 'fr/rebase-i-continue-preserve-options' (diff) | |
| parent | Merge branch 'ja.po' of https://github.com/qykth-git/gitk (diff) | |
| download | tgif-c3ee2e2c9deb1e7846e864494cdb2fbc7bb1a285.tar.xz | |
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: sv.po: Update Swedish translation (311t)
gitk: Let .bleft.mid widgets 'breathe'
gitk: Match ttk fonts to gitk fonts
gitk: Update revision date in Japanese PO file
gitk: Update "Language:" header
gitk: Improve translation message
gitk: Remove unused line
gitk: Update year
gitk: Change last translator line
gitk: Update fuzzy messages
gitk: Update Japanese translation
gitk: Fix translation around copyright sign
gitk: Update Japanese translation
gitk: Fix wrong translation
gitk: Translate Japanese catalog
gitk: Translate more to Japanese catalog
gitk: Update Japanese message catalog
gitk: Re-sync line number in Japanese message catalogue
gitk: Color name update
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions