Commits

Author Commit Message Labels Comments Date
jpellerin
Merged
jpellerin
More uptodate .emacs
Jason Pellerin
Another merge tool attempt
Jason Pellerin
emacs/ediff merge tool
jpellerin
Added my .emacs (slightly redacted)