summaryrefslogtreecommitdiffstats
path: root/.emacs.d/site-lisp/oni.el
Commit message (Collapse)AuthorAgeFilesLines
* .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-171-0/+8
|
* Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-171-11/+9
|\ | | | | | | | | Conflicts: .xinitrc
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-171-0/+6
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-161-1/+0
|/
* .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-111-0/+555