Merge branch 'master' of git://gitorious.org/dtsenc/dtsenc
authorGit User <user@userbase.com>
Mon, 2 Jan 2012 17:10:31 +0000 (18:10 +0100)
committerGit User <user@userbase.com>
Mon, 2 Jan 2012 17:10:31 +0000 (18:10 +0100)
commit468325d64b94726f57d9e7d20b2bc16839a304f5
treeedef388502502a5f6f83efaa6380fbf7958780c7
parent854ac975120b8af2cc88d1acdfe72517ba24a3d4
parent2f42b8f97cab6b74236906ce89f7bf61a067e0db
Merge branch 'master' of git://gitorious.org/dtsenc/dtsenc

Conflicts:
dcaenc.c