8 commits

Author	SHA1	Message	Date
Tom Willemsen	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
Tom Willemsen	f0daa3f3cf	.emacs.d/site-lisp/oni.el	2012-10-22 23:59:18 +02:00
Tom Willemsen	1f67da1508	.emacs.d/site-lisp/oni.el	2012-10-18 11:11:05 +02:00
Tom Willemsen	a38c6eee1a	.emacs.d/site-lisp/oni.el	2012-10-17 09:04:32 +02:00
Tom Willemsen	821793e7de	Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .xinitrc	2012-10-17 08:48:46 +02:00
Tom Willemsen	e3a2616488	.emacs.d/site-lisp/oni.el	2012-10-17 00:38:18 +02:00
Tom Willemsen	0c6b068a8f	.emacs.d/site-lisp/oni.el	2012-10-16 10:04:32 +02:00
Tom Willemsen	838fc8289c	.emacs.d/site-lisp/oni.el	2012-10-11 21:23:13 +02:00