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 /.config/awesome | |
| 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 '.config/awesome')
| -rw-r--r-- | .config/awesome/Makefile | 5 | ||||
| -rw-r--r-- | .config/awesome/themes/Makefile | 4 | ||||
| -rw-r--r-- | .config/awesome/themes/custom/Makefile | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/.config/awesome/Makefile b/.config/awesome/Makefile new file mode 100644 index 0000000..bec3818 --- /dev/null +++ b/.config/awesome/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/awesome +modules=themes +objects=bowl.lua ext.lua infoline.lua keychain.lua oni.lua rc.lua + +include ../../dotfiles.mk diff --git a/.config/awesome/themes/Makefile b/.config/awesome/themes/Makefile new file mode 100644 index 0000000..85298f3 --- /dev/null +++ b/.config/awesome/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +modules=custom + +include ../../../dotfiles.mk diff --git a/.config/awesome/themes/custom/Makefile b/.config/awesome/themes/custom/Makefile new file mode 100644 index 0000000..8cebe3d --- /dev/null +++ b/.config/awesome/themes/custom/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/custom +objects=theme.lua + +include ../../../../dotfiles.mk |