diff options
| author |  Tom Willemsen | 2012-12-05 00:44:09 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
| commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
| tree | 3dbec6a3880ca980694def0d737a477b68254691 /.moc | |
| parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
| parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
| download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.moc')
| -rw-r--r-- | .moc/Makefile | 5 | ||||
| -rw-r--r-- | .moc/themes/Makefile | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.moc/Makefile b/.moc/Makefile new file mode 100644 index 0000000..5eb4fa2 --- /dev/null +++ b/.moc/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.moc +modules=themes +objects=config + +include ../dotfiles.mk diff --git a/.moc/themes/Makefile b/.moc/themes/Makefile new file mode 100644 index 0000000..fd61c62 --- /dev/null +++ b/.moc/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +objects=custom + +include ../../dotfiles.mk |