summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
Commit message (Collapse)AuthorAgeFilesLines
...
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-271-12/+18
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-211-8/+11
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-201-4/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-191-4/+9
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-11-141-3/+0
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-141-1/+0
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-141-2/+0
| |
* | .config/herbstluftwm/autostartGravatar Tom Willemsen2012-11-081-7/+5
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-071-3/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-071-2/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-11-051-2/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-261-0/+14
|\| | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-261-0/+14
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-241-130/+66
|\| | | | | | | | | | | | | Conflicts: .emacs.d/site-lisp/oni.el .xinitrc .zprofile
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-3/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-23/+3
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-231-14/+0
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-221-81/+25
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-1/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-1/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-191-9/+35
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-181-1/+1
| |
* | .emacs.d/init.elGravatar Tom Willemsen2012-10-171-0/+3
| |
* | .emacs.d/init.elGravatar Tom Willemsen2012-10-171-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-171-9/+18
|\| | | | | | | | | Conflicts: .xinitrc
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-171-0/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-171-1/+8
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-161-6/+9
| |
* | .emacs.d/init.elGravatar Tom Willemsen2012-10-121-3/+0
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-121-667/+24
|\| | | | | | | | | | | Conflicts: .config/cower/config .emacs.d/init.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-111-652/+16
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-111-2/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-111-11/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-101-0/+2
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-071-2/+10
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-10-071-5/+23
|\| | | | | | | | | Conflicts: .config/awesome/rc.lua
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-071-1/+6
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-071-2/+9
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-10-031-1/+3
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-271-2/+6
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-09-251-74/+46
|\| | | | | | | | | Conflicts: .emacs.d/init.el
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-251-0/+3
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-251-74/+46
| |
* | .emacs.d/init.elGravatar Tom Willemsen2012-09-251-0/+10
| |
* | Merge remote-tracking branch 'origin/master' into phoenixGravatar Tom Willemsen2012-09-171-8/+7
|\|
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-171-1/+4
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-171-6/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-171-1/+1
| |
| * .emacs.d/init.elGravatar Tom Willemsen2012-09-161-0/+1
| |
* | .emacs.d/init.elGravatar Tom Willemsen2012-09-171-1/+0
|/