Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into phoenix | Tom Willemsen | 2012-10-17 | 1 | -11/+9 |
|\ | | | | | | | | | Conflicts: .xinitrc | ||||
| * | .emacs.d/site-lisp/oni.el | Tom Willemsen | 2012-10-17 | 1 | -0/+6 |
| | | |||||
| * | .emacs.d/site-lisp/oni.el | Tom Willemsen | 2012-10-16 | 1 | -1/+0 |
|/ | |||||
* | .emacs.d/site-lisp/oni.el | Tom Willemsen | 2012-10-11 | 1 | -0/+555 |