Merge remote-tracking branch 'greg/master'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Mon, 3 Oct 2011 04:51:32 +0000 (00:51 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Mon, 3 Oct 2011 04:51:32 +0000 (00:51 -0400)
commit9c937631215577e96e377b2c6aa6ad8f700efeda
treedf2fcca743ff5d54bef987cfbc1eac8834eef885
parentde3e16c858ac240303f1626b93d53a52b080c1a2
parented921b01bcbe65fabe853607630866af81bc5da5
Merge remote-tracking branch 'greg/master'

Conflicts:
src/opus_encoder.c
src/opus_encoder.c