summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-01 21:22:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-01 21:22:35 -0700
commit242cab397214b017ac837e870ac9950efc2968c3 (patch)
tree8cd4163d3e16dcb16c7a1f3315200b4294554233 /fmt-merge-msg.h
parentSync with v1.7.10.1 (diff)
parentl10n: Update German translation (diff)
downloadtgif-242cab397214b017ac837e870ac9950efc2968c3.tar.xz
Merge branch 'master' of https://github.com/git-l10n/git-po
By Jiang Xin (2) and Ralf Thielow (1) via Jiang Xin * 'master' of https://github.com/git-l10n/git-po: l10n: Update German translation l10n: Update Simplified Chinese translation l10n: Update git.pot (33 new, 24 deleted messages)
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions