summaryrefslogtreecommitdiff
path: root/.config/subversion/config
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:12:40 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:12:40 -0400
commit8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch)
treee5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.config/subversion/config
parent9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff)
parentb0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts: .config/bash/rc.sh .config/login.sh .config/ssh/config .config/wmii/include.sh
Diffstat (limited to '.config/subversion/config')
0 files changed, 0 insertions, 0 deletions