summaryrefslogtreecommitdiffstats
path: root/.emacs.d/site-lisp/oni.el
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-12-051-8/+20
|\ | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-12-041-6/+5
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-281-0/+7
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-271-2/+8
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-211-0/+13
|\|
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-201-0/+6
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-191-0/+7
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-141-3/+34
|\|
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-141-1/+4
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-141-2/+30
| |
* | .config/herbstluftwm/autostartGravatar Tom Willemsen2012-11-081-0/+8
|\|
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-051-0/+8
| |
* | .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-261-1/+3
|\| | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-261-1/+2
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-241-2/+4
|\| | | | | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el .xinitrc .zprofile
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-221-6/+4
| |
| * .emacs.d/site-lisp/oni.elGravatar Tom Willemsen2012-10-181-0/+8
| |
* | .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