Commit graph

148 commits

Author SHA1 Message Date
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
bed06c2d5f .emacs.d/icons/scheme.xpm 2012-10-07 23:14:45 +02:00
4fab1e25f3 .emacs.d/init.el 2012-10-07 22:13:55 +02:00
4f7962022f .emacs.d/site-lisp/mode-icons.el 2012-10-07 22:13:32 +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
d8ce7b6cce .emacs.d/site-lisp/eltuki.el 2012-10-07 13:19:23 +02:00
5cfcc802d2 .emacs.d/init.el 2012-10-07 13:18:59 +02:00
91d5bae6f3 .emacs.d/gnus.el 2012-10-07 13:18:41 +02:00
ac7f5b4831 .emacs.d/snippets/html-mode/for 2012-10-05 16:48:33 +02:00
489ef112e4 .emacs.d/snippets/html-mode/generic-block 2012-10-05 16:48:11 +02:00
898bf6dfb3 .emacs.d/snippets/org-mode/codeblock 2012-10-04 22:05:50 +02:00
52cc4fcaa5 .emacs.d/snippets/org-mode/heading 2012-10-04 22:05:33 +02:00
86db852e0c .emacs.d/themes/new-theme.el 2012-10-03 02:51:08 +02:00
5943855ab5 .emacs.d/site-lisp/quick-edit-mode.el 2012-10-03 02:50:41 +02:00
2745411925 .emacs.d/init.el 2012-10-03 02:50:02 +02:00
df6be90649 .emacs.d/site-lisp/eltuki.el 2012-10-03 02:46:05 +02:00
01e05f9d67 .emacs.d/themes/new-theme.el 2012-09-28 10:41:45 +02:00
db951570b2 .emacs.d/.gitignore 2012-09-27 23:33:58 +02:00
0f49923222 .emacs.d/themes/new-theme.el 2012-09-27 23:32:48 +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
7370081612 .emacs.d/themes/new-theme.el 2012-09-25 22:03:20 +02:00
883b25b99f .emacs.d/site-lisp/quick-edit-mode.el 2012-09-25 22:02:59 +02:00
c06c9b92ed .emacs.d/init.el 2012-09-25 10:01:33 +02:00
14d2e1e1f2 .emacs.d/site-lisp/quick-edit-mode.el 2012-09-25 10:01:12 +02:00
a5d4bf52f1 .emacs.d/themes/new-theme.el 2012-09-25 09:58:55 +02:00