diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
| commit | 9e79a6c3bbc37c2eec19e055566440f0b1173c5c (patch) | |
| tree | 7516e65c0289b9a68b3a97fe2abbdf0d7dba8d8d /.config/emacs/.gitignore | |
| parent | 5c42078bd052705b69d6ea93ff7617445be43789 (diff) | |
| parent | d65775a22e1648eca8e74389a4d9c1c299017cf3 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/bash/rc.sh
.config/conkeror
.config/conkerorrc
.config/emacs/custom.el
.config/irbrc
.config/login.sh
.config/maildirproc/att.rc
.config/maildirproc/default.rc
.config/offlineimaprc
.config/ssh/config
.config/wmii-hg/autostart
.config/wmii-hg/include.sh
.config/wmii-hg/quit
.config/wmii-hg/rbar_battery
.config/wmii-hg/rbar_clock
.config/wmii-hg/rbar_cpu
.config/wmii-hg/rbar_wifi
.conkerorrc
.maildirproc/default.rc
Diffstat (limited to '.config/emacs/.gitignore')
0 files changed, 0 insertions, 0 deletions