Commit graph

23 commits

Author SHA1 Message Date
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
c037a4ea8f .config/awesome/rc.lua 2012-10-10 09:09:44 +02:00
02a49112c3 .config/awesome/rc.lua 2012-10-07 22:14:27 +02:00
52abe4f881 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.config/awesome/rc.lua
2012-10-07 15:23:23 +02:00
c317a15200 .config/awesome/rc.lua 2012-10-07 13:17:36 +02:00
b4e8c45e18 .config/awesome/rc.lua 2012-10-03 02:47:17 +02:00
5b8d412cf7 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/init.el
2012-09-25 22:20:43 +02:00
13fb3c1942 .config/awesome/rc.lua 2012-09-25 09:56:59 +02:00
1a767eeab0 Merge remote-tracking branch 'origin/master' into phoenix 2012-09-17 20:32:32 +02:00
fa473dd629 .config/awesome/rc.lua 2012-09-17 20:28:13 +02:00
0c2db260cd .config/awesome/rc.lua 2012-09-16 23:41:03 +02:00
bbc17210a1 .config/awesome/rc.lua 2012-09-15 14:28:45 +02:00
ab024745fa .config/awesome/rc.lua 2012-09-15 02:04:23 +02:00
a5689e945d .config/awesome/ 2012-09-14 10:31:10 +02:00
d5836762a0 .config/awesome/rc.lua 2012-09-14 09:55:58 +02:00
802607545b .config/awesome/rc.lua 2012-09-13 17:14:39 +02:00
adf8e13bb0 .config/awesome/rc.lua 2012-09-13 10:57:37 +02:00
ddff03f5ec .config/awesome/rc.lua 2012-09-13 10:32:33 +02:00
0228c95a0b .config/awesome/rc.lua 2012-09-13 01:57:14 +02:00
b08f6026ed .config/awesome/rc.lua 2012-09-12 23:32:08 +02:00
af2ad2ac32 .config/awesome/rc.lua 2012-09-12 23:27:44 +02:00
f7f8460b83 .config/awesome/rc.lua 2012-09-12 23:26:52 +02:00
ab1346c7a8 Add awesome config 2012-09-12 23:15:44 +02:00