thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'upstream/master' into t7g-ios

Browse source 
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
This commit is contained in:
Matthew Hoops 2011-05-11 00:30:02 -04:00
commit a1d41da096
1292 changed files with 16937 additions and 13332 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/quicktime.cpp
View file

@ -36,6 +36,7 @@
#include "common/macresman.h"
#include "common/memstream.h"
#include "common/quicktime.h"
#include "common/textconsole.h"
#include "common/util.h"
#include "common/zlib.h"