Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into phoenix | 2012-12-05 | 1 | -8/+20 | |
|\ | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el | ||||
| * | .emacs.d/site-lisp/oni.el | 2012-12-04 | 1 | -6/+5 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-28 | 1 | -0/+7 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-27 | 1 | -2/+8 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | 2012-11-21 | 1 | -0/+13 | |
|\| | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-20 | 1 | -0/+6 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-19 | 1 | -0/+7 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | 2012-11-14 | 1 | -3/+34 | |
|\| | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-14 | 1 | -1/+4 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-14 | 1 | -2/+30 | |
| | | |||||
* | | .config/herbstluftwm/autostart | 2012-11-08 | 1 | -0/+8 | |
|\| | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-11-05 | 1 | -0/+8 | |
| | | |||||
* | | .emacs.d/site-lisp/oni.el | 2012-11-08 | 1 | -1/+1 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | 2012-10-26 | 1 | -1/+3 | |
|\| | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el | ||||
| * | .emacs.d/site-lisp/oni.el | 2012-10-26 | 1 | -1/+2 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | 2012-10-24 | 1 | -2/+4 | |
|\| | | | | | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el .xinitrc .zprofile | ||||
| * | .emacs.d/site-lisp/oni.el | 2012-10-22 | 1 | -6/+4 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-10-18 | 1 | -0/+8 | |
| | | |||||
* | | .emacs.d/site-lisp/oni.el | 2012-10-17 | 1 | -0/+8 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | 2012-10-17 | 1 | -11/+9 | |
|\| | | | | | | | | | Conflicts: .xinitrc | ||||
| * | .emacs.d/site-lisp/oni.el | 2012-10-17 | 1 | -0/+6 | |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | 2012-10-16 | 1 | -1/+0 | |
|/ | |||||
* | .emacs.d/site-lisp/oni.el | 2012-10-11 | 1 | -0/+555 | |