diff options
| author |  Tom Willemsen | 2013-02-15 15:37:42 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-02-15 15:37:42 +0100 |
| commit | 934d02bcacaa5d0aef64a8edf7677f3b0c198666 (patch) | |
| tree | edfc842025b5f8569973567b44ad62aa662f548f /.conkerorrc/Makefile | |
| parent | 06ff316f7f3b098504a6342651a79017cfb80ae7 (diff) | |
| parent | ee34dfcc2c2fec53731b64afca03bb34dd80b2ba (diff) | |
| download | dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.tar.gz dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.zip | |
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
Diffstat (limited to '.conkerorrc/Makefile')
| -rw-r--r-- | .conkerorrc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.conkerorrc/Makefile b/.conkerorrc/Makefile index d2bc0db..8161f39 100644 --- a/.conkerorrc/Makefile +++ b/.conkerorrc/Makefile @@ -1,5 +1,5 @@ DESTDIR:=$(DESTDIR)/.conkerorrc -modules=themes -objects=gtk2rc init.js +modules=themes styles +objects=gtk2rc init.js ext_restore.js include ../dotfiles.mk |