Commit graph

175 commits

Author SHA1 Message Date
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
2d3476b96a .emacs.d/site-lisp/wm-init.el 2012-10-26 00:53:28 +02:00
8136125d18 .emacs.d/site-lisp/oni.el 2012-10-26 00:52:39 +02:00
3aba2dc6d8 .emacs.d/site-lisp/metalexpress.el 2012-10-26 00:51:39 +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
31d3b87a97 .emacs.d/site-lisp/org-init.el 2012-10-24 01:02:43 +02:00
af62874a4a .emacs.d/init.el 2012-10-23 00:23:36 +02:00
ae482bccfe .emacs.d/site-lisp/wm-init.el 2012-10-23 00:23:25 +02:00
a38365ecf3 .emacs.d/init.el 2012-10-23 00:06:35 +02:00
5823bb57b5 .emacs.d/site-lisp/mu4e-init.el 2012-10-23 00:06:23 +02:00
89b0ac6c2b .emacs.d/init.el 2012-10-23 00:02:14 +02:00
d719607d10 .emacs.d/site-lisp/wm-init.el 2012-10-22 23:59:55 +02:00
6a9e18bf35 .emacs.d/init.el 2012-10-22 23:59:38 +02:00
f0daa3f3cf .emacs.d/site-lisp/oni.el 2012-10-22 23:59:18 +02:00
7dea9e3f6b .emacs.d/site-lisp/org-init.el 2012-10-22 23:58:46 +02:00
c7ae790a99 .emacs.d/themes/yoshi-theme.el 2012-10-19 23:00:19 +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
e5bd3dd2e3 .emacs.d/themes/yoshi-theme.el 2012-10-19 13:33:10 +02:00
63fa5175f8 .emacs.d/themes/new-theme.el 2012-10-19 13:30:18 +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
1f67da1508 .emacs.d/site-lisp/oni.el 2012-10-18 11:11:05 +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
a38c6eee1a .emacs.d/site-lisp/oni.el 2012-10-17 09:04:32 +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
0d98656954 .emacs.d/themes/new-theme.el 2012-10-17 00:38:47 +02:00
4631acd02d .emacs.d/init.el 2012-10-17 00:38:29 +02:00
e3a2616488 .emacs.d/site-lisp/oni.el 2012-10-17 00:38:18 +02:00
aaf6d4a717 .emacs.d/themes/new-theme.el 2012-10-16 10:17:11 +02:00
0c6b068a8f .emacs.d/site-lisp/oni.el 2012-10-16 10:04:32 +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
e95ddbff6f .emacs.d/themes/new-theme.el 2012-10-11 21:23:48 +02:00
9c4dffec45 .emacs.d/init.el 2012-10-11 21:23:32 +02:00
1a28fba2e0 .emacs.d/site-lisp/ext.el 2012-10-11 21:23:24 +02:00
838fc8289c .emacs.d/site-lisp/oni.el 2012-10-11 21:23:13 +02:00
961905f2c3 .emacs.d/themes/new-theme.el 2012-10-11 15:46:48 +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
ed985b92f2 .emacs.d/themes/new-theme.el 2012-10-11 10:12:39 +02:00
04fe40d248 .emacs.d/themes/new-theme.el 2012-10-10 09:19:01 +02:00
3b005ef724 .emacs.d/themes/new-theme.el 2012-10-10 09:11:12 +02:00
acd052dfab .emacs.d/init.el 2012-10-10 09:10:18 +02:00
4f57503a70 .emacs.d/themes/new-theme.el 2012-10-07 23:56:02 +02:00
fbc911bd00 .emacs.d/themes/new-theme.el 2012-10-07 23:33:31 +02:00