From: Penny Leach <penny@mjollnir.org>
Date: Wed, 28 Dec 2011 20:51:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into demetrius
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4786fa8e535f64b9b8aa315224b0ec0e15208550;p=dotfiles%2Fmplayer.git

Merge remote-tracking branch 'origin/master' into demetrius

Conflicts:
	.mplayer/config
---

4786fa8e535f64b9b8aa315224b0ec0e15208550
diff --cc .mplayer/config
index 0d31bf2,f52c614..a2361c3
--- a/.mplayer/config
+++ b/.mplayer/config
@@@ -1,6 -1,6 +1,7 @@@
  # Write your default config options here!
  heartbeat-cmd="xscreensaver-command -deactivate"
  stop-xscreensaver=1
 +vo=gl2
+ fs=yes