|
|
934d02bcac
|
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/awesome/rc.lua
.emacs.d/init.el
.emacs.d/init.org
.emacs.d/site-lisp/oni.el
|
2013-02-15 15:37:42 +01:00 |
|
|
|
7a5a232c27
|
Emacs: Update some things
|
2013-01-15 12:11:41 +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 |
|
|
|
f5e88cf609
|
Add Makefiles for all files
|
2012-12-05 00:13:28 +01:00 |
|
|
|
9b3cc1d28d
|
Add Makefiles to .emacs.d
|
2012-12-04 22:05:24 +01:00 |
|
|
|
60f8f37817
|
.emacs.d/snippets/org-mode/heading
|
2012-11-08 00:32:08 +01: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 |
|
