Merge tag 'v0.20.7'

release v0.20.7
2017-05-15 23:01:49 +02:00
parent 89b900432e b4c9d9c2a7
commit 4faef28cc5
289 changed files with 914 additions and 924 deletions
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -152,7 +152,7 @@ PlayerControl::LockSetBorderPause(bool _border_pause)
 }

 player_status
-PlayerControl::LockGetStatus()
+PlayerControl::LockGetStatus() noexcept
 {
 	player_status status;