Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Fri, 20 Dec 2013 21:28:47 +0000 (21:28 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 20 Dec 2013 21:28:47 +0000 (21:28 +0000)
commita5b59faff75265d3256ad0dbd9f0c69e51e31ce4
treec004aa04bcccff1ef8cf0d9f0a8f00c4da8831e0
parent9b21d77dccc88d9b77085e05845e0b8e2d606b3b
parent13b133de7fb5b953c23c58790c2d1f2a8bf4009c
Merge branch '1.0' into 1.0-seek
src/lib/audio_content.cc