Matthew Hoops
|
aa49b38c5a
|
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
|
2011-05-31 14:16:29 -04:00 |
|
Matthew Hoops
|
a1d41da096
|
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
|
2011-05-11 00:30:28 -04:00 |
|
Matthew Hoops
|
6d153f311c
|
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
|
2011-04-13 16:04:29 -04:00 |
|
Matthew Hoops
|
8cf73e3fb4
|
AUDIO: Split QuickTime audio into a new class
Standalone QuickTime files can now be played as an AudioStream
|
2011-04-07 19:40:07 -04:00 |
|