summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 15:06:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-02 15:06:25 -0700
commitca2b71a00b47e47990b3a196c9ae26ac6b19e287 (patch)
tree51ee3a65becf81b5baf0cfda182ae2f86e1bc091 /resolve-undo.h
parentSync with 1.7.9.6 (diff)
parentgitk: fix setting font display with new tabbed dialog layout. (diff)
downloadtgif-ca2b71a00b47e47990b3a196c9ae26ac6b19e287.tar.xz
Merge branch 'pt/gitk'
* pt/gitk: gitk: fix setting font display with new tabbed dialog layout. gitk: fix tabbed preferences construction when using tcl 8.4
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions