Merge pull request #8949 from fritsch/jarvisae
authorMartijn Kaijser <martijn@xbmc.org>
Sun, 24 Jan 2016 00:00:20 +0000 (01:00 +0100)
committerMartijn Kaijser <martijn@xbmc.org>
Sun, 24 Jan 2016 00:00:20 +0000 (01:00 +0100)
commitccb2226cbe0aad8a420ea54d728917ad53567eb8
treea6d3a515c69322c276b27f6fa3e4548275feacd7
parentbcecf88057836ef77b3348e5d50081c869abdb7e
parenta78a52528fedbab050163dd0ca9a9e1f48ec9cb6
Merge pull request #8949 from fritsch/jarvisae

ActiveAE: Increase timeout for sink init to 60 seconds