summaryrefslogtreecommitdiff
path: root/.config/login.d/01_locale.sh
AgeCommit message (Collapse)Author
2015-02-06Merge remote-tracking branch 'origin/master' into purdue-cs/masterLuke Shumaker
Conflicts: .config/X11/clientrc .config/bash/rc.d/emacs.sh .config/cron/make-config .config/emacs/custom.el .config/emacs/init.el .config/git/config .config/login.sh .config/selected_editor .local/bin/config-path