[Orxonox-commit 1556] r6274 - in data/trunk: . audio/sounds

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-08 15:31:53 +0100 (Tue, 08 Dec 2009)
New Revision: 6274

Modified:
   data/trunk/
   data/trunk/audio/sounds/Engine_charge.ogg
   data/trunk/audio/sounds/Engine_high.ogg
   data/trunk/audio/sounds/Engine_idle.ogg
   data/trunk/audio/sounds/Engine_low.ogg
   data/trunk/audio/sounds/Engine_off.ogg
Log:
Merged altaudio branch back to the data trunk.


Property changes on: data/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /data/branches/media_stripped:5591-5657
   + /data/branches/altaudio:6211-6263
/data/branches/media_stripped:5591-5657

Modified: data/trunk/audio/sounds/Engine_charge.ogg
===================================================================
(Binary files differ)

Modified: data/trunk/audio/sounds/Engine_high.ogg
===================================================================
(Binary files differ)

Modified: data/trunk/audio/sounds/Engine_idle.ogg
===================================================================
(Binary files differ)

Modified: data/trunk/audio/sounds/Engine_low.ogg
===================================================================
(Binary files differ)

Modified: data/trunk/audio/sounds/Engine_off.ogg
===================================================================
(Binary files differ)