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 /.conkerorrc/Makefile | |
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 '.conkerorrc/Makefile')
-rw-r--r-- | .conkerorrc/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.conkerorrc/Makefile b/.conkerorrc/Makefile new file mode 100644 index 0000000..d2bc0db --- /dev/null +++ b/.conkerorrc/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.conkerorrc +modules=themes +objects=gtk2rc init.js + +include ../dotfiles.mk |