Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 17:09:13 +0000 (09:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 17:09:13 +0000 (09:09 -0800)
* 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)

1  2 
gitk-git/gitk
gitk-git/po/pt_br.po
gitk-git/po/sv.po

diff --cc gitk-git/gitk
index 1b0e09a,e82c6bf..e82c6bf
mode 100644,100755..100644
--- 2/gitk
index 0000000,1486e32..1486e32
mode 000000,100644..100644
--- /dev/null
Simple merge