Merge branch 'sound'
commitc57ac09f34b08213b1629eba3d5d5c6b0bb15a78
authorTom Prince <tom.prince@ualberta.net>
Mon, 26 Apr 2010 22:42:15 +0000 (26 18:42 -0400)
committerTom Prince <tom.prince@ualberta.net>
Mon, 26 Apr 2010 22:42:15 +0000 (26 18:42 -0400)
treec3d55aebaa829b0532a8993bb21fb16108fc163f
parentd74803e98ff664df058646bab7518290ed1379e4
parentd2b6b668f0326cee3770de2f7be8dd22631fae3d
Merge branch 'sound'
gemrb/core/Interface.cpp
gemrb/core/ResourceManager.cpp
gemrb/core/SoundMgr.cpp
gemrb/plugins/AREImporter/AREImporter.cpp