From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 26 Mar 2011 17:42:26 +0000 (-0700)
Subject: Merge git-gui 0.14.0
X-Git-Tag: v1.7.5-rc0~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42f98745732c68baa6d79a50eab0d726b549025d;p=thirdparty%2Fgit.git

Merge git-gui 0.14.0
---

42f98745732c68baa6d79a50eab0d726b549025d
diff --cc git-gui/po/glossary/pt_br.po
index 0000000000,eb039b2b49..eb039b2b49
mode 000000,100644..100644
--- a/git-gui/po/glossary/pt_br.po
+++ b/git-gui/po/glossary/pt_br.po
diff --cc git-gui/po/pt_br.po
index 0000000000,b175b9791e..b175b9791e
mode 000000,100644..100644
--- a/git-gui/po/pt_br.po
+++ b/git-gui/po/pt_br.po