summaryrefslogtreecommitdiff
path: root/.kde/share/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 /.kde/share/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 '.kde/share/config')
l---------.kde/share/config1
1 files changed, 0 insertions, 1 deletions
diff --git a/.kde/share/config b/.kde/share/config
deleted file mode 120000
index 231b1b5..0000000
--- a/.kde/share/config
+++ /dev/null
@@ -1 +0,0 @@
-../../.config/ \ No newline at end of file