diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
commit | b624374191f4499ccb2a72daa5fd0aa4e0e66a94 (patch) | |
tree | 5a5753c0d7242c8667419e33059b3a2870175b90 /.gitk | |
parent | 8ffc4249b8eca31071de95a482ac2a3bf6b7b40e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
Diffstat (limited to '.gitk')
-rw-r--r-- | .gitk | 36 |
1 files changed, 0 insertions, 36 deletions
@@ -1,36 +0,0 @@ -set mainfont {Helvetica 9} -set textfont {{DejaVu Sans Mono} 9} -set uifont {Helvetica 9 bold} -set tabstop 8 -set findmergefiles 0 -set maxgraphpct 50 -set maxwidth 16 -set cmitmode patch -set wrapcomment none -set autoselect 1 -set autosellen 40 -set showneartags 1 -set hideremotes 0 -set showlocalchanges 1 -set datetimeformat {%Y-%m-%d %H:%M:%S} -set limitdiffs 1 -set uicolor grey85 -set want_ttk 1 -set bgcolor white -set fgcolor black -set colors {green red blue magenta darkgrey brown orange} -set diffcolors {red "#00a000" blue} -set markbgcolor #e0e0ff -set diffcontext 4 -set selectbgcolor gray85 -set extdifftool meld -set perfile_attrs 0 -set geometry(main) 1364x658+0+0 -set geometry(state) normal -set geometry(topwidth) 1364 -set geometry(topheight) 358 -set geometry(pwsash0) "617 1" -set geometry(pwsash1) "1025 1" -set geometry(botwidth) 889 -set geometry(botheight) 295 -set permviews {} |