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

Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche

Browse source 
Conflicts:
	engines/avalanche/timeout2.cpp
	engines/avalanche/trip6.cpp
This commit is contained in:
Strangerke 2013-06-30 14:14:31 +02:00
commit 63737c3878
26 changed files with 1895 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/avalanche/enid2.cpp
View file

@ -27,9 +27,6 @@
/* ENID Edna's manager. */
#include "common/scummsys.h"
#include "common/textconsole.h"
#include "avalanche/avalanche.h"
#include "avalanche/enid2.h"
@ -39,6 +36,9 @@
#include "avalanche/timeout2.h"
#include "avalanche/celer2.h"
#include "avalanche/sequence2.h"
#include "common/textconsole.h"
//#include "fileunit.h"
//#include "basher.h"