summaryrefslogtreecommitdiff
path: root/.git.info.exclude.in
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-04-26 13:56:43 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-04-26 13:56:43 -0400
commita0b0e2faf634625c2ae1981cb1a5604648ad8334 (patch)
treef288acabdb8849a46e333536a71004d39ac2ba34 /.git.info.exclude.in
parente93048c125c728d61613d76eab938da9bf7f41c4 (diff)
parentf6742e8302f615b75eb6a2dd4faf3b306be56012 (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts: .config/wmii-hg/autostart
Diffstat (limited to '.git.info.exclude.in')
0 files changed, 0 insertions, 0 deletions