diff options
author | Tom Willemsen | 2012-10-12 08:52:53 +0200 |
---|---|---|
committer | Tom Willemsen | 2012-10-12 08:52:53 +0200 |
commit | 77c39ea0f082446f21981bd0876a4f1fde3c4807 (patch) | |
tree | 8843848d7c92d6be20a3e23bd22c0c9e5218022d /.moc | |
parent | 8bcf0ae40fc2e9c6565567131218029768859839 (diff) | |
parent | 1f3bdb9e4490e20aefd7038a507aee50c76728dc (diff) | |
download | dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.tar.gz dotfiles-77c39ea0f082446f21981bd0876a4f1fde3c4807.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/cower/config
.emacs.d/init.el
Diffstat (limited to '.moc')
-rw-r--r-- | .moc/config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.moc/config b/.moc/config new file mode 100644 index 0000000..76619d2 --- /dev/null +++ b/.moc/config @@ -0,0 +1,3 @@ +Layout1 = playlist(0,0,100%,100%):directory(0,0,100%,100%) +Layout2 = directory(0,0,50%,100%):playlist(50%,0,FILL,100%) +CanStartInPlaylist = yes |