Commit graph

22 commits

Author SHA1 Message Date
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
ae482bccfe .emacs.d/site-lisp/wm-init.el 2012-10-23 00:23:25 +02:00
5823bb57b5 .emacs.d/site-lisp/mu4e-init.el 2012-10-23 00:06:23 +02:00
d719607d10 .emacs.d/site-lisp/wm-init.el 2012-10-22 23:59:55 +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
1f67da1508 .emacs.d/site-lisp/oni.el 2012-10-18 11:11:05 +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
e3a2616488 .emacs.d/site-lisp/oni.el 2012-10-17 00:38:18 +02:00
0c6b068a8f .emacs.d/site-lisp/oni.el 2012-10-16 10:04: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
4f7962022f .emacs.d/site-lisp/mode-icons.el 2012-10-07 22:13:32 +02:00
d8ce7b6cce .emacs.d/site-lisp/eltuki.el 2012-10-07 13:19:23 +02:00
5943855ab5 .emacs.d/site-lisp/quick-edit-mode.el 2012-10-03 02:50:41 +02:00
df6be90649 .emacs.d/site-lisp/eltuki.el 2012-10-03 02:46:05 +02:00
883b25b99f .emacs.d/site-lisp/quick-edit-mode.el 2012-09-25 22:02:59 +02:00
14d2e1e1f2 .emacs.d/site-lisp/quick-edit-mode.el 2012-09-25 10:01:12 +02:00
9a50086107 Restructure emacs configuration 2012-08-18 13:57:56 +02:00
0b0f0fa73c Merge .emacs.d 2012-08-18 13:19:27 +02:00