diff options
author | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
---|---|---|
committer | Tom Willemsen | 2013-04-11 15:37:01 +0200 |
commit | 55ca176cd5022d2fc35bc2c06d5f9a764315f238 (patch) | |
tree | 3ee9e0df6dced4282af9116a8c93d888e30b7213 /.conkerorrc/themes/Makefile | |
parent | caf0ec0fb16b3f911d5d596766ee3048fe07fa66 (diff) | |
parent | 9ab70194a65f1d7ab726aaacdb43a58a02a048b6 (diff) | |
download | dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.tar.gz dotfiles-55ca176cd5022d2fc35bc2c06d5f9a764315f238.zip |
Merge remote-tracking branch 'ryuslash/drd' into phoenix
Conflicts:
.config/herbstluftwm/autostart
.emacs.d/init.el
.xinitrc
.zprofile
Makefile
xmonad/xmonad.hs
Diffstat (limited to '.conkerorrc/themes/Makefile')
-rw-r--r-- | .conkerorrc/themes/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.conkerorrc/themes/Makefile b/.conkerorrc/themes/Makefile index a88d833..adb917a 100644 --- a/.conkerorrc/themes/Makefile +++ b/.conkerorrc/themes/Makefile @@ -1,4 +1,4 @@ DESTDIR:=$(DESTDIR)/themes -modules=naquadah +modules=naquadah yoshi include ../../dotfiles.mk |