diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
| commit | 118f849aed5aef3bf2750ca102007b4a38e44486 (patch) | |
| tree | 47eb202ab5e4ed21a43122a44ed331e76a7bf258 /.config/symlinks | |
| parent | 739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (diff) | |
| parent | 641fc49fc651b6a67fb8ff90198e889e0e3920bb (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
# Conflicts:
# .config/X11/clientrc
# .config/bash/rc.sh
# .config/cron/make-config
# .config/emacs/custom.el
# .config/emacs/init.el
# .config/login.d/10_selected-editor.sh
# .config/login.sh
Diffstat (limited to '.config/symlinks')
| -rw-r--r-- | .config/symlinks | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.config/symlinks b/.config/symlinks index 37a7267..c99afba 100644 --- a/.config/symlinks +++ b/.config/symlinks @@ -15,9 +15,6 @@ .config/bash/login.sh .bash_login .config/bash/logout.sh .bash_logout -# Files plucked out of multi-purpose directories -.config/gpg/gpg.conf .gnupg/gpg.conf - # Individual config files .config/abs.conf .abs.conf .config/conkerorrc .conkerorrc @@ -26,16 +23,14 @@ .config/irbrc .irbrc .config/linphonerc .linphonerc # .config/selected_editor .selected_editor +.config/X11/login .vnc/xstartup .config/offlineimaprc .offlineimaprc .cache/offlineimap .offlineimap # Directories -.cache/maildirproc/ .maildirproc - .config/arduino/ .arduino .config/bazaar/ .bazaar -.config/cpan/ .cpan .config/emacs/ .emacs.d .config/icons/ .icons .config/mozilla/ .mozilla # @@ -46,6 +41,9 @@ .config/wmii-hg/ .wmii-hg .config/wmii/ .wmii # +# .maildirproc is not used, but must exist +/tmp/ .maildirproc + # KDE .config/ .kde/share/apps # .config/ .kde/share/config # |