summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 09:19:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 09:19:47 -0700
commit02f419efcbda05f9923306ae1fcdd754187563fa (patch)
tree303cd25265af99353ef8798badba998cb29fa1b2 /resolve-undo.h
parentMerge branch 'maint' (diff)
parentl10n: Add the Dutch translation team and initialize nl.po (diff)
downloadtgif-02f419efcbda05f9923306ae1fcdd754187563fa.tar.xz
Merge git://github.com/git-l10n/git-po
Portuguese Portuguese translations from Marco Sousa via Jiang Xin * 'master' of git://github.com/git-l10n/git-po: l10n: Add the Dutch translation team and initialize nl.po l10n: Inital Portuguese Portugal language (pt_PT) l10n: Improve zh_CN translation for Git 1.7.10-rc3
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions