From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Dec 2010 17:09:13 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.7.4-rc0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f6e0505bb854db5b25ba977432471fed218a73;p=thirdparty%2Fgit.git

Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Add Brazilian Portuguese (pt-BR) translation
  gitk: Make text selectable on Mac
  gitk: Prevent the text pane from becoming editable
  gitk: Add the equivalent of diff --color-words
  gitk: Update Swedish translation (290t)
  gitk: Show notes by default (like git log does)
---

74f6e0505bb854db5b25ba977432471fed218a73
diff --cc gitk-git/gitk
index 1b0e09a561,e82c6bfede..e82c6bfede
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/pt_br.po
index 0000000000,1486e3205a..1486e3205a
mode 000000,100644..100644
--- a/gitk-git/po/pt_br.po
+++ b/gitk-git/po/pt_br.po