Merge remote-tracking branch 'origin/master' into thinkpenguin-par

8 files changed, 17 insertions, 50 deletions

diff --git a/.config/symlinks b/.config/symlinks
index 2cbe055..3d87984 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -9,25 +9,27 @@
 
 .config/arduino/	.arduino
 .config/bazaar/		.bazaar
+.config/cpan/		.cpan
 .config/emacs/		.emacs.d
 .config/gimp-2.6/	.gimp-2.6
 .config/gimp-2.8/	.gimp-2.8
+.config/maildirproc/	.maildirproc
 .config/mozilla/	.mozilla	#
+.config/mplayer/	.mplayer
 .config/nanorc		.nanorc
 .config/netbeans/	.netbeans	
+.config/purple/		.purple
 .config/ssh/		.ssh		#
 .config/subversion/	.subversion
 .config/wmii/		.wmii
-.config/mplayer/	.mplayer
-.config/purple/		.purple
-.config/cpan/		.cpan
-.config/maildirproc	.maildirproc
-.config/offlineimaprc	.offlineimaprc
+
 .config/conkerorrc	.conkerorrc
 .config/hgrc		.hgrc
 .config/linphonerc	.linphonerc
-.config			.kde/share/apps
-.config			.kde/share/config
+.config/offlineimaprc	.offlineimaprc
+
+.config/		.kde/share/apps
+.config/		.kde/share/config
 
-.kde			.kde4
-.mozilla		.conkeror.mozdev.org
+.kde/			.kde4
+.mozilla/		.conkeror.mozdev.org
diff --git a/.conkeror.mozdev.org b/.conkeror.mozdev.org
index 729efd7..49c36a2 120000
--- a/.conkeror.mozdev.org
+++ b/.conkeror.mozdev.org
@@ -1 +1 @@
-.mozilla
\ No newline at end of file
+.mozilla/
\ No newline at end of file
diff --git a/.git.info.exclude.in b/.git.info.exclude.in
index 0b361b1..0c5ce40 100644
--- a/.git.info.exclude.in
+++ b/.git.info.exclude.in
@@ -84,6 +84,7 @@ lock
 # Ignore these files for no good reason
 .bogofilter
 .gem
+.gitk
 .offlineimap
 .prefix
 .prefix.*
diff --git a/.gitk b/.gitk
deleted file mode 100644
index cbdfd9a..0000000
--- a/.gitk
+++ /dev/null
@@ -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 {}
diff --git a/.kde/share/apps b/.kde/share/apps
index 7f8f949..231b1b5 120000
--- a/.kde/share/apps
+++ b/.kde/share/apps
@@ -1 +1 @@
-../../.config
\ No newline at end of file
+../../.config/
\ No newline at end of file
diff --git a/.kde/share/config b/.kde/share/config
index 7f8f949..231b1b5 120000
--- a/.kde/share/config
+++ b/.kde/share/config
@@ -1 +1 @@
-../../.config
\ No newline at end of file
+../../.config/
\ No newline at end of file
diff --git a/.kde4 b/.kde4
index bdb1556..f9d3b5c 120000
--- a/.kde4
+++ b/.kde4
@@ -1 +1 @@
-.kde
\ No newline at end of file
+.kde/
\ No newline at end of file
diff --git a/.maildirproc b/.maildirproc
index fb36d1f..f29b6d2 120000
--- a/.maildirproc
+++ b/.maildirproc
@@ -1 +1 @@
-.config/maildirproc
\ No newline at end of file
+.config/maildirproc/
\ No newline at end of file