Commit graph

76 commits

Author SHA1 Message Date
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
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
4631acd02d .emacs.d/init.el 2012-10-17 00:38:29 +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
9c4dffec45 .emacs.d/init.el 2012-10-11 21:23:32 +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
acd052dfab .emacs.d/init.el 2012-10-10 09:10:18 +02:00
4fab1e25f3 .emacs.d/init.el 2012-10-07 22:13:55 +02:00
52abe4f881 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.config/awesome/rc.lua
2012-10-07 15:23:23 +02:00
6abf336344 .emacs.d/init.el 2012-10-07 13:58:59 +02:00
5cfcc802d2 .emacs.d/init.el 2012-10-07 13:18:59 +02:00
2745411925 .emacs.d/init.el 2012-10-03 02:50:02 +02:00
ae2aa8ec91 .emacs.d/init.el 2012-09-27 23:32:30 +02:00
5b8d412cf7 Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
	.emacs.d/init.el
2012-09-25 22:20:43 +02:00
b2de3d6412 .emacs.d/init.el 2012-09-25 22:12:45 +02:00
c06c9b92ed .emacs.d/init.el 2012-09-25 10:01:33 +02:00
555164a19a .emacs.d/init.el 2012-09-25 09:58:26 +02:00
1a767eeab0 Merge remote-tracking branch 'origin/master' into phoenix 2012-09-17 20:32:32 +02:00
aa949b255f .emacs.d/init.el 2012-09-17 20:32:26 +02:00
d6c8f4f979 .emacs.d/init.el 2012-09-17 20:01:41 +02:00
68a6bbf6e3 .emacs.d/init.el 2012-09-17 09:53:59 +02:00
74c83e68d1 .emacs.d/init.el 2012-09-17 02:03:41 +02:00
53843e560e .emacs.d/init.el 2012-09-16 23:41:22 +02:00
96149a8546 .emacs.d/init.el 2012-09-15 13:38:08 +02:00
1391c88fe8 .emacs.d/init.el 2012-09-15 02:04:55 +02:00
6cd580c3be .emacs.d/init.el 2012-09-14 09:56:35 +02:00
f7f9f0dcd0 .emacs.d/init.el 2012-09-14 01:55:41 +02:00
377b0ea4c2 .emacs.d/init.el 2012-09-13 10:38:37 +02:00
0fe5824dbb .emacs.d/init.el 2012-09-11 23:27:45 +02:00
69cb5a6daf .emacs.d/init.el 2012-09-11 21:03:50 +02:00
71b21beaa6 Move Emacs config 2012-09-11 10:32:30 +02:00
Tom Willemsen
94b05b65ef Split off emacs configs to dotemacs 2011-09-20 01:08:06 +02:00
Tom Willemsen
8d1a79a72c Enable new global-rainbow-delimiters-mode 2011-09-19 20:16:12 +02:00
Tom Willemsen
9451afae69 EMACS: Add X urgency hint when someone speaks to me on jabber 2011-09-16 12:11:16 +02:00
Tom Willemsen
ad50751c32 EMACS: add autosmiley to jabber 2011-09-15 15:40:01 +02:00
Tom Willemsen
3d46033e3d EMACS: Change autocomplete colors 2011-09-14 20:43:49 +02:00
Tom Willemsen
4f0850d764 EMACS: I can use let* instead of 2x let 2011-09-14 20:15:49 +02:00
Tom Willemsen
b804526353 EMACS: Trying out ide-skel again 2011-09-14 20:12:59 +02:00
Tom Willemsen
89f75979d4 EMACS: Simplify directory loading 2011-09-14 16:16:16 +02:00
Tom Willemsen
e8daaf61eb EMACS: Changed font size, again 2011-09-14 16:09:17 +02:00
Tom Willemsen
d2fcc5eb1c EMACS: Added autocomplete 2011-09-14 16:05:59 +02:00
Tom Willemsen
1377acf25f EMACS: windmove change 2011-09-14 13:36:17 +02:00
Tom Willemsen
2b552136fb EMACS: Added some ELPA repositories 2011-09-13 10:35:54 +02:00
Tom Willemsen
f44c2a4f66 EMACS: No need to load functions.el, doesn't exist anymore 2011-09-10 23:51:53 +02:00
Tom Willemsen
8897dcf394 EMACS: Init style update 2011-09-10 22:23:46 +02:00