Merge pull request #3614 from elupus/audio_clean

author Joakim Plate <elupus@ecce.se>

Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)

committer Joakim Plate <elupus@ecce.se>

Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)
author Joakim Plate <elupus@ecce.se>
Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)
committer Joakim Plate <elupus@ecce.se>
Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)
diff --cc XBMC.xcodeproj/project.pbxproj
Simple merge
diff --cc project/VS2010Express/XBMC.vcxproj
Simple merge
diff --cc xbmc/cores/dvdplayer/DVDPlayer.cpp
Simple merge
author	Joakim Plate <elupus@ecce.se>
	Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)
committer	Joakim Plate <elupus@ecce.se>
	Mon, 11 Nov 2013 19:24:38 +0000 (11:24 -0800)
		1	2
XBMC.xcodeproj/project.pbxproj	patch \|	diff1 \|	diff2 \|	blob \| history
project/VS2010Express/XBMC.vcxproj	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/cores/dvdplayer/DVDPlayer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history