Merge branch 'refs/heads/t/para_play' into next
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:09 +0000 (08:36 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:09 +0000 (08:36 +0200)
* refs/heads/t/para_play:
  play: New option: --end-of-playlist.

1  2 
error.h

diff --cc error.h
Simple merge