From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Apr 2010 01:36:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.7.1-rc2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8a12280530f16bf2089999ceefe35794d115d07;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Display dirty submodules correctly
  gitk: Fix display of copyright symbol
  gitk: Add emacs editor variable block
  gitk: Avoid calling tk_setPalette on Windows
  gitk: Don't clobber "Remember this view" setting
  gitk: Add comments to explain encode_view_opts and decode_view_opts
  gitk: Use consistent font for all text input fields
  gitk: Set the font for all listbox widgets
  gitk: Set the font for all spinbox widgets
  gitk: Remove forced use of sans-serif font
  gitk: Add Ctrl-W shortcut for closing the active window
---

e8a12280530f16bf2089999ceefe35794d115d07
diff --cc gitk-git/gitk
index 1f36a3e81,1b0e09a56..1b0e09a56
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk