Commit graph

289 commits

Author SHA1 Message Date
6278e2e634 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-12-05 00:44:09 +01:00
f5e88cf609 Add Makefiles for all files 2012-12-05 00:13:28 +01:00
9c12ab5718 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-14 20:12:55 +01:00
8d2d8ac9f7 .config/zathura/zathurarc 2012-11-14 20:04:04 +01:00
cb6548a39c .config/herbstluftwm/autostart 2012-11-14 01:21:54 +01:00
8892442870 .config/dunst/dunstrc 2012-11-14 01:21:39 +01:00
d975618750 .config/herbstluftwm/autostart 2012-11-11 23:29:00 +01:00
c69ad1a11f .config/dunst/dunstrc 2012-11-11 23:23:38 +01:00
432524aa4d Undo move 2012-11-10 12:57:14 +01:00
e1b5ceb331 Move syntax-highlighting 2012-11-09 10:48:40 +01:00
41dca31756 Move ZSH configs 2012-11-09 10:44:45 +01:00
57e1063403 .config/herbstluftwm/autostart 2012-11-08 00:34:15 +01:00
e0b16d97cb .config/herbstluftwm/autostart 2012-11-08 00:29:28 +01:00
3104a8c298 .config/zathura/zathurarc 2012-11-07 18:55:10 +01:00
fdefffa218 .config/herbstluftwm/autostart 2012-11-07 18:49:51 +01:00
b5aeceaa32 .config/fehlstart/fehlstart.rc 2012-11-07 03:29:09 +01:00
82679b5ade .config/herbstluftwm/autostart 2012-11-07 03:27:29 +01:00
9c68f9b3a6 .config/herbstluftwm/autostart 2012-11-05 21:01:59 +01: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
f43586292c .config/dunst/dunstrc 2012-10-23 00:02:36 +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
9eb16a0418 .config/newsbeuter/config 2012-10-11 21:29:02 +02:00
319fb2353d .config/herbstluftwm/panel.sh 2012-10-11 21:28:01 +02:00
247f866dc1 .config/herbstluftwm/autostart 2012-10-11 21:27:52 +02:00
7047e6f2f3 .config/fish/config.fish 2012-10-11 21:27:17 +02:00
bba50dcde6 .config/cower/config 2012-10-11 21:26:44 +02:00
1b02e9a398 .config/clfswm/clfswmrc 2012-10-11 21:26:24 +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
dd7c1d4aa0 .config/awesome/ext.lua 2012-10-07 22:14:13 +02:00
52abe4f881 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.config/awesome/rc.lua
2012-10-07 15:23:23 +02:00
6eea81b5ca .config/awesome/themes/custom/theme.lua 2012-10-07 13:18:05 +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