summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-08-22 20:44:04 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-08-22 20:44:04 -0400
commitad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch)
tree79bb00ec5be01214f1ebc99509308f2083c17717 /.gitconfig
parent2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff)
parent510fea7116c6bd01824af38b4e516b6e19fded81 (diff)
Merge branch 'master' into build64-par
Conflicts: .crontab
Diffstat (limited to '.gitconfig')
0 files changed, 0 insertions, 0 deletions