audio: fixes after git rebase
commit9c2575e5673adb3932094507415c999328e83f92
authorJakub Adam <jakub.adam@ktknet.cz>
Sat, 1 May 2010 21:53:08 +0000 (1 23:53 +0200)
committerJakub Adam <jakub.adam@ktknet.cz>
Sat, 1 May 2010 21:53:08 +0000 (1 23:53 +0200)
treeba0d3f6c75d38e5bcb1ae7968ce0614ba4841277
parent794e93dca56e9732c3cc809d79e712a72453bfc0
audio: fixes after git rebase
src/api/sipe-media.h
src/core/sipe-media.c
src/core/sipe.c
src/purple/purple-media.c