svn merge -r 30718:30912 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorJoerg Mueller <nexyon@gmail.com>
Fri, 30 Jul 2010 22:34:27 +0000 (22:34 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 30 Jul 2010 22:34:27 +0000 (22:34 +0000)
commit61c9e46aad2cf679331341c7d38f10bec19203a9
tree84f7231156c8c35cc8acd785fc48a96cd1d2d820
parentc59b930d135ce7527542da96d1984842cf5e42ff
parente4a16c8010f8bdf4bed4e2661929cd0858649d25
svn merge -r 30718:30912 https://svn.blender.org/svnroot/bf-blender/trunk/blender
intern/audaspace/intern/AUD_IReader.h
intern/audaspace/intern/AUD_StreamBufferFactory.cpp