diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-19 17:01:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-02-19 17:01:30 -0500 |
| commit | 8d363bafb3f9d0fb8d90b9247dd0aa85eb2bf5ed (patch) | |
| tree | 4abf6f43e822c58d28d798ca54b9155ae590f3bf /.local | |
| parent | a042731ad4eb5fdad5d1748b462d22dd0049e469 (diff) | |
| parent | db32e22df76eaa0b1c3eed59c64232a724d26913 (diff) | |
Merge branch 'master' into gluglugt60-par/master
# Conflicts:
# .config/emacs/init.el
Diffstat (limited to '.local')
0 files changed, 0 insertions, 0 deletions