Commit graph

136 commits

Author SHA1 Message Date
f3982b8c33 Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
	.xinitrc
2012-06-06 23:48:40 +00:00
9fb7650a9d .config/herbstluftwm/autostart 2012-06-03 22:30:34 +02:00
d1a25f617f .config/herbstluftwm/autostart 2012-06-02 05:35:55 +02:00
9b75282bc2 .config/herbstluftwm/autostart 2012-06-02 05:35:46 +02:00
51a37e48d1 .config/herbstluftwm/autostart 2012-06-02 05:31:23 +02:00
36cd435141 .config/herbstluftwm/autostart 2012-05-28 22:29:50 +02:00
90cccbae8a Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
	.config/herbstluftwm/autostart
	.xbindkeysrc.scm
	.xinitrc
2012-05-22 14:36:52 +00:00
1ea643146c .config/newsbeuter/urls 2012-05-22 10:12:28 +02:00
b75e896c13 .config/newsbeuter/urls 2012-05-21 20:57:59 +02:00
c5de1d3d6f .config/newsbeuter/urls 2012-05-21 20:48:31 +02:00
ce7f706cf8 .config/newsbeuter/urls 2012-05-14 11:26:34 +02:00
1539fef546 .config/newsbeuter/urls 2012-05-10 23:04:23 +02:00
b50ca30cd9 .config/newsbeuter/urls 2012-05-04 14:52:20 +02:00
dd2c8a93c3 .config/cower/config 2012-05-01 10:19:38 +02:00
9d693df69f .config/newsbeuter/urls 2012-04-24 00:25:07 +02:00
ebb53cdff9 .config/newsbeuter/urls 2012-04-22 22:08:11 +02:00
7a621a0850 .config/newsbeuter/urls 2012-04-22 20:04:51 +02:00
9b6f6f6f1a .config/newsbeuter/urls 2012-04-22 20:04:22 +02:00
748c761a35 .config/herbstluftwm/autostart 2012-04-22 01:57:08 +02:00
e8b0fa5f60 .config/herbstluftwm/autostart 2012-04-22 01:49:01 +02:00
b388356500 .config/newsbeuter/urls 2012-04-22 01:38:42 +02:00
0a91f5e359 .config/herbstluftwm/autostart 2012-04-21 17:37:42 +02:00
a528d7fef8 .config/herbstluftwm/panel.sh 2012-04-21 17:33:09 +02:00
66181fb653 .config/herbstluftwm/panel.sh 2012-04-21 17:04:44 +02:00
eca300b055 .config/herbstluftwm/panel.sh 2012-04-21 17:02:11 +02:00
701ef480aa .config/herbstluftwm/panel.sh 2012-04-21 17:01:05 +02:00
3431b2ecea .config/herbstluftwm/panel.sh 2012-04-21 16:59:18 +02:00
eebebe3686 .config/herbstluftwm/autostart 2012-04-21 16:47:37 +02:00
2e2422481c .config/herbstluftwm/autostart 2012-04-21 16:40:13 +02:00
0b775a872e Merge remote-tracking branch 'ryuslash/master' into phoenix 2012-04-19 09:11:23 +00:00
f4a2593d1a .config/herbstluftwm/panel.sh 2012-04-06 13:41:55 +02:00
d6ca7bc7a2 .config/herbstluftwm/panel.sh 2012-04-06 13:35:28 +02:00
a6b0a5230b .config/herbstluftwm/panel.sh 2012-04-06 13:34:30 +02:00
ab76bcaa64 .xinitrc 2012-04-05 14:40:24 +00:00
04d9496f04 .config/newsbeuter/config 2012-04-05 01:56:01 +02:00
2ccd864e6f .config/newsbeuter/urls 2012-04-01 20:05:05 +02:00
e71736a7e7 .config/newsbeuter/urls 2012-03-30 12:34:35 +02:00
00d51bca14 .config/newsbeuter/urls 2012-03-28 10:32:56 +02:00
682a682ca4 .config/newsbeuter/urls 2012-03-28 10:28:56 +02:00
651ab5625d Merge remote-tracking branch 'github/master' into phoenix 2012-03-27 22:09:16 +02:00
b94bf37670 .config/newsbeuter/config 2012-03-27 21:10:11 +02:00
5a397c09ce .config/htop/htoprc 2012-03-27 21:07:28 +02:00
209a39c387 .config/herbstluftwm/panel.sh 2012-03-27 21:03:41 +02:00
c70f9f2730 .config/herbstluftwm/panel.sh 2012-03-27 21:02:33 +02:00
c38b2998a3 .config/herbstluftwm/panel.sh 2012-03-27 21:02:28 +02:00
1175754ea3 .config/herbstluftwm/panel.sh 2012-03-27 21:02:13 +02:00
ed3eb90ad7 .config/herbstluftwm/panel.sh 2012-03-27 21:01:56 +02:00
2c37e26c72 .config/herbstluftwm/panel.sh 2012-03-27 21:01:18 +02:00
d23d87c885 .config/newsbeuter/urls 2012-03-26 15:59:38 +02:00
9708b42601 .config/cower/config 2012-03-25 22:20:24 +02:00