diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
commit | b624374191f4499ccb2a72daa5fd0aa4e0e66a94 (patch) | |
tree | 5a5753c0d7242c8667419e33059b3a2870175b90 /.config | |
parent | 8ffc4249b8eca31071de95a482ac2a3bf6b7b40e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
Diffstat (limited to '.config')
-rw-r--r-- | .config/symlinks | 20 |
1 files changed, 11 insertions, 9 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 |