Johannes Schickel 7d0f5c9f1c Merge branch 'master' into osystem-palette ...

Conflicts:
	engines/sky/screen.h

2011-02-16 00:14:37 +01:00

..

music

AUDIO: Rename sound/ dir to audio/

2011-02-09 01:09:01 +00:00

autoroute.cpp

…

autoroute.h

…

compact.cpp

…

compact.h

…

control.cpp

…

control.h

…

debug.cpp

SKY: Fix array access in debug code.

2011-02-16 00:05:15 +01:00

debug.h

…

detection.cpp

…

disk.cpp

…

disk.h

…

grid.cpp

…

grid.h

…

hufftext.cpp

…

intro.cpp

SKY: Stop intro sound before freeing the buffer.

2011-02-16 00:05:09 +01:00

intro.h

AUDIO: Rename sound/ dir to audio/

2011-02-09 01:09:01 +00:00

logic.cpp

…

logic.h

…

module.mk

…

mouse.cpp

…

mouse.h

…

rnc_deco.cpp

…

rnc_deco.h

…

screen.cpp

Merge branch 'master' into osystem-palette

2011-02-16 00:14:37 +01:00

screen.h

Merge branch 'master' into osystem-palette

2011-02-16 00:14:37 +01:00

sky.cpp

SKY: get rid of timer based gfx updates

2011-02-14 10:18:38 +01:00

sky.h

SKY: get rid of timer based gfx updates

2011-02-14 10:18:38 +01:00

skydefs.h

…

sound.cpp

AUDIO: Rename sound/ dir to audio/

2011-02-09 01:09:01 +00:00

sound.h

AUDIO: Rename sound/ dir to audio/

2011-02-09 01:09:01 +00:00

struc.h

…

text.cpp

…

text.h

…