diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
commit | 786fcda41a731654dd2de7496d5f28bc7bb19743 (patch) | |
tree | ab557aa22a6463fd15667ec738b12f7fd78d7aa1 /.config/symlinks | |
parent | 614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.kde/share/apps
.kde/share/config
.kde4
Diffstat (limited to '.config/symlinks')
-rw-r--r-- | .config/symlinks | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/.config/symlinks b/.config/symlinks new file mode 100644 index 0000000..3d87984 --- /dev/null +++ b/.config/symlinks @@ -0,0 +1,35 @@ +.config/X11/defaults .Xdefaults +.config/X11/clientrc .xinitrc +.config/X11/serverrc .xserverrc +.config/X11/login .xsession + +.config/bash/rc.sh .bashrc +.config/bash/login.sh .bash_login +.config/bash/logout.sh .bash_logout + +.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/conkerorrc .conkerorrc +.config/hgrc .hgrc +.config/linphonerc .linphonerc +.config/offlineimaprc .offlineimaprc + +.config/ .kde/share/apps +.config/ .kde/share/config + +.kde/ .kde4 +.mozilla/ .conkeror.mozdev.org |