Johannes Schickel 71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.". ... For further discussion check here: https://github.com/scummvm/scummvm/pull/16 Conflicts: graphics/png.cpp		2011-05-01 16:54:45 +02:00
..
actor.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
actor.h
animation.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
animation.h
assets.cpp
assets.h	COMMON: Replace MKID_BE by MKTAG	2011-04-12 16:53:15 +02:00
burger_data.h
compression.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
compression.h
console.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
console.h
converse.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
converse.h
detection.cpp
dialogs.cpp	Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".	2011-05-01 16:54:45 +02:00
dialogs.h
events.cpp	ALL: colour -> color	2011-04-14 14:12:35 +02:00
events.h
font.cpp	ALL: colour -> color	2011-04-14 14:12:35 +02:00
font.h	ALL: colour -> color	2011-04-14 14:12:35 +02:00
globals.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
globals.h
graphics.cpp	Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".	2011-05-01 16:54:45 +02:00
graphics.h	ALL/GRAPHICS: Remove Surface::bytesPerPixel.	2011-04-17 21:27:34 +02:00
gui.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
gui.h
hotspot.cpp
hotspot.h
m4_menus.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
m4_menus.h
m4_scene.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
m4_scene.h	ALL: colour -> color	2011-04-14 14:12:35 +02:00
m4_views.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
m4_views.h	M4: Fix twisted assignment	2011-03-29 21:57:43 +02:00
m4.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
m4.h	M4: Change MidiPlayer to derive from Audio::MidiPlayer	2011-03-24 16:46:47 +01:00
mads_anim.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
mads_anim.h
mads_logic.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
mads_logic.h
mads_menus.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
mads_menus.h
mads_player.cpp
mads_player.h
mads_scene.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
mads_scene.h
mads_views.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
mads_views.h	ALL: colour -> color	2011-04-14 14:12:35 +02:00
midi.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
midi.h	AUDIO: Move more common code to Audio::MidiPlayer	2011-03-25 14:15:53 +01:00
module.mk
rails.cpp	JANITORIAL: Remove/comment unused vars	2011-03-29 21:57:56 +02:00
rails.h
resource.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
resource.h
saveload.cpp
saveload.h
scene.cpp	ALL: colour -> color	2011-04-14 14:12:35 +02:00
scene.h
script.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
script.h
scripttab.h
sound.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
sound.h
sprite.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
sprite.h
staticres.cpp
staticres.h
viewmgr.cpp
viewmgr.h
woodscript.cpp	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
woodscript.h	ALL: colour -> color	2011-04-14 14:12:35 +02:00
ws_machine.cpp
ws_sequence.cpp	ALL: colour -> color	2011-04-14 14:12:35 +02:00