Commit graph

26 commits

Author SHA1 Message Date
5cff0a1e09 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	dotfiles.mk
2012-12-14 00:32:05 +01:00
614fcffbb7 Send jabber message as appt reminders 2012-12-06 22:40:43 +01:00
1e84d8bee4 Change prompts for jabber
This way all text is nicely alligned
2012-12-06 13:04:29 +01:00
6278e2e634 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-12-05 00:44:09 +01:00
ac510449fc .emacs.d/site-lisp/oni.el 2012-12-04 17:45:20 +01:00
bb9e6aab9d .emacs.d/site-lisp/oni.el 2012-11-28 10:13:49 +01:00
92eba9c869 .emacs.d/site-lisp/oni.el 2012-11-27 11:12:59 +01:00
fa717d86a0 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-21 01:23:32 +01:00
e2ed387df1 .emacs.d/site-lisp/oni.el 2012-11-20 18:53:43 +01:00
07be108b4e .emacs.d/site-lisp/oni.el 2012-11-19 23:23:13 +01:00
9c12ab5718 Merge remote-tracking branch 'origin/master' into phoenix 2012-11-14 20:12:55 +01:00
5abfdc6b5c .emacs.d/site-lisp/oni.el 2012-11-14 20:05:27 +01:00
ec37bc37ca .emacs.d/site-lisp/oni.el 2012-11-14 01:23:05 +01:00
57e1063403 .config/herbstluftwm/autostart 2012-11-08 00:34:15 +01:00
96b2ebe6e8 .emacs.d/site-lisp/oni.el 2012-11-08 00:30:19 +01:00
2490c4a89c .emacs.d/site-lisp/oni.el 2012-11-05 21:04:56 +01:00
cbdfa4cac3 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/site-lisp/oni.el
2012-10-26 01:46:09 +02:00
8136125d18 .emacs.d/site-lisp/oni.el 2012-10-26 00:52: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
f0daa3f3cf .emacs.d/site-lisp/oni.el 2012-10-22 23:59:18 +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
838fc8289c .emacs.d/site-lisp/oni.el 2012-10-11 21:23:13 +02:00