Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ryuslash/master' into phoenix | Tom Willemsen | 2013-02-15 | 3 | -1/+66 |
|\ | | | | | | | | | | | | | | | Conflicts: .config/awesome/rc.lua .emacs.d/init.el .emacs.d/init.org .emacs.d/site-lisp/oni.el | ||||
| * | Emacs: Update some things | Tom Willemsen | 2013-01-15 | 3 | -1/+66 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | Tom Willemsen | 2013-01-04 | 8 | -1/+49 |
|\| | | | | | | | | | Conflicts: .emacs.d/init.el | ||||
| * | Emacs: Include python-mode snippets | Tom Willemsen | 2012-12-28 | 1 | -1/+1 |
| | | |||||
| * | Emacs: Manually set-up w3m | Tom Willemsen | 2012-12-28 | 7 | -0/+48 |
| | | | | | | | | | | Only `w3m-goto-url' and `w3m-bookmark-view' are ever really used to start w3m, no need to load `w3m-load' for that. | ||||
* | | Merge remote-tracking branch 'origin/master' into phoenix | Tom Willemsen | 2012-12-05 | 3 | -0/+12 |
|\| | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el | ||||
| * | Add Makefiles for all files | Tom Willemsen | 2012-12-05 | 3 | -6/+6 |
| | | |||||
| * | Add Makefiles to .emacs.d | Tom Willemsen | 2012-12-04 | 3 | -0/+12 |
| | | |||||
* | | .emacs.d/snippets/org-mode/heading | Tom Willemsen | 2012-11-08 | 1 | -5/+5 |
|/ | |||||
* | .emacs.d/snippets/html-mode/for | Tom Willemsen | 2012-10-05 | 1 | -0/+8 |
| | |||||
* | .emacs.d/snippets/html-mode/generic-block | Tom Willemsen | 2012-10-05 | 1 | -0/+8 |
| | |||||
* | .emacs.d/snippets/org-mode/codeblock | Tom Willemsen | 2012-10-04 | 1 | -0/+7 |
| | |||||
* | .emacs.d/snippets/org-mode/heading | Tom Willemsen | 2012-10-04 | 1 | -0/+9 |