summaryrefslogtreecommitdiff
path: root/delta.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-18 18:36:41 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-18 18:36:41 -0700
commite8a12280530f16bf2089999ceefe35794d115d07 (patch)
tree772c7871a466e1fe33fe5aa47cab8f1e6831c2c5 /delta.h
parent77bc694907bdf517407cc6f79da8adf9a4879cea (diff)
parenta1d383c5ab90ec19c8a77158f65e5ea7d61fb42c (diff)
downloadgit-e8a12280530f16bf2089999ceefe35794d115d07.tar.gz
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
Diffstat (limited to 'delta.h')
0 files changed, 0 insertions, 0 deletions