Fix merge conflict. Double free.0.6.1
authorNathan Caldwell <saintdev@gmail.com>
Thu, 16 Aug 2007 20:14:31 +0000 (14:14 -0600)
committerNathan Caldwell <saintdev@gmail.com>
Thu, 16 Aug 2007 20:14:31 +0000 (14:14 -0600)
commit1d1df8952bf71dee97b2ef8ae5ca3e5d333cd75d
tree421634af16c99566044e6869dc6a56dfe4c894af
parentd91f115d5448e9f1e3d0239f98236871d5583b1e
Fix merge conflict. Double free.
src/matroska.c