Commit graph

97 commits

Author SHA1 Message Date
fa717d86a0 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-21 01:23:32 +01:00
d027e71839 .emacs.d/init.el 2012-11-20 18:53:28 +01:00
c99d57dbf3 .emacs.d/init.el 2012-11-19 23:22:51 +01:00
9c12ab5718 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-14 20:12:55 +01:00
169e18603e .emacs.d/init.el 2012-11-14 20:04:51 +01:00
8a15c875ac .emacs.d/init.el 2012-11-14 01:22:40 +01:00
57e1063403 .config/herbstluftwm/autostart 2012-11-08 00:34:15 +01:00
7d198e5604 .emacs.d/init.el 2012-11-07 18:53:32 +01:00
7481b80d53 .emacs.d/init.el 2012-11-07 03:27:54 +01:00
1c630b0ad7 .emacs.d/init.el 2012-11-05 21:04:22 +01:00
cbdfa4cac3 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-10-26 01:46:09 +02:00
2e70340b95 .emacs.d/init.el 2012-10-26 00:54:23 +02:00
d6be1ae80f Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
	.xinitrc
	.zprofile
2012-10-24 01:36:38 +02:00
af62874a4a .emacs.d/init.el 2012-10-23 00:23:36 +02:00
a38365ecf3 .emacs.d/init.el 2012-10-23 00:06:35 +02:00
89b0ac6c2b .emacs.d/init.el 2012-10-23 00:02:14 +02:00
6a9e18bf35 .emacs.d/init.el 2012-10-22 23:59:38 +02:00
19024fdfab .emacs.d/init.el 2012-10-19 22:59:45 +02:00
9b97541602 .emacs.d/init.el 2012-10-19 13:33:21 +02:00
cd7d508120 .emacs.d/init.el 2012-10-19 13:29:34 +02:00
7713dfa53a .emacs.d/init.el 2012-10-18 11:11:55 +02:00
5c4c72f56f .emacs.d/init.el 2012-10-17 20:32:31 +02:00
434357f917 .emacs.d/init.el 2012-10-17 09:04:54 +02:00
821793e7de Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.xinitrc
2012-10-17 08:48:46 +02:00
b74622f11b .emacs.d/init.el 2012-10-17 01:01:12 +02:00
4631acd02d .emacs.d/init.el 2012-10-17 00:38:29 +02:00
f60cb771b6 .emacs.d/init.el 2012-10-16 10:04:03 +02:00
ff6639d051 .emacs.d/init.el 2012-10-12 10:45:21 +02:00
77c39ea0f0 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.config/cower/config
	.emacs.d/init.el
2012-10-12 08:52:53 +02:00
9c4dffec45 .emacs.d/init.el 2012-10-11 21:23:32 +02:00
dc53d891de .emacs.d/init.el 2012-10-11 15:46:37 +02:00
6715a0daa7 .emacs.d/init.el 2012-10-11 10:13:14 +02:00
acd052dfab .emacs.d/init.el 2012-10-10 09:10:18 +02:00
4fab1e25f3 .emacs.d/init.el 2012-10-07 22:13:55 +02:00
52abe4f881 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.config/awesome/rc.lua
2012-10-07 15:23:23 +02:00
6abf336344 .emacs.d/init.el 2012-10-07 13:58:59 +02:00
5cfcc802d2 .emacs.d/init.el 2012-10-07 13:18:59 +02:00
2745411925 .emacs.d/init.el 2012-10-03 02:50:02 +02:00
ae2aa8ec91 .emacs.d/init.el 2012-09-27 23:32:30 +02:00
5b8d412cf7 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/init.el
2012-09-25 22:20:43 +02:00
b2de3d6412 .emacs.d/init.el 2012-09-25 22:12:45 +02:00
c06c9b92ed .emacs.d/init.el 2012-09-25 10:01:33 +02:00
555164a19a .emacs.d/init.el 2012-09-25 09:58:26 +02:00
1a767eeab0 Merge remote-tracking branch 'origin/master' into phoenix 2012-09-17 20:32:32 +02:00
aa949b255f .emacs.d/init.el 2012-09-17 20:32:26 +02:00
d6c8f4f979 .emacs.d/init.el 2012-09-17 20:01:41 +02:00
68a6bbf6e3 .emacs.d/init.el 2012-09-17 09:53:59 +02:00
74c83e68d1 .emacs.d/init.el 2012-09-17 02:03:41 +02:00
53843e560e .emacs.d/init.el 2012-09-16 23:41:22 +02:00
96149a8546 .emacs.d/init.el 2012-09-15 13:38:08 +02:00