Bastien Bouclet b77469a4d3 Merge remote-tracking branch 'origin/master' into sprint ... Conflicts: backends/events/sdl/sdl-events.cpp backends/events/sdl/sdl-events.h video/bink_decoder.cpp		2012-01-07 08:43:26 +01:00
..
algorithm.h	sync with scummvm	2012-01-06 22:56:21 +01:00
archive.cpp	Merge remote-tracking branch 'origin/master' into sprint	2012-01-07 08:43:26 +01:00
archive.h	sync with scummvm	2012-01-06 22:56:21 +01:00
array.h	sync with scummvm	2012-01-06 22:56:21 +01:00
bitstream.h	sync with scummvm	2012-01-06 22:56:21 +01:00
bufferedstream.h	sync with scummvm	2011-05-18 23:33:39 +02:00
config-file.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
config-file.h	sync with scummvm	2012-01-06 22:56:21 +01:00
config-manager.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
config-manager.h	sync with scummvm	2012-01-06 22:56:21 +01:00
cosinetables.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
cosinetables.h	sync with scummvm	2011-07-20 08:02:02 +02:00
dct.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
dct.h	sync with scummvm	2011-07-20 08:02:02 +02:00
debug-channels.h	sync with scummvm	2011-05-18 23:33:39 +02:00
debug.cpp	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
debug.h	sync with scummvm	2011-05-18 23:33:39 +02:00
endian.h	sync with scummvm	2011-05-18 23:33:39 +02:00
error.cpp	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
error.h	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
EventDispatcher.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
EventRecorder.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
EventRecorder.h	sync with scummvm	2012-01-06 22:56:21 +01:00
events.h	Merge remote-tracking branch 'origin/master' into sprint	2012-01-07 08:43:26 +01:00
fft.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
fft.h	sync with scummvm	2011-07-20 08:02:02 +02:00
file.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
file.h	sync with scummvm	2012-01-06 22:56:21 +01:00
forbidden.h	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
foreach.h	COMMON: Include scummsys.h, to have uint.	2011-12-14 17:46:29 +01:00
frac.h	sync with scummvm	2011-05-18 23:33:39 +02:00
fs.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
fs.h	sync with scummvm	2012-01-06 22:56:21 +01:00
func.h	sync with scummvm	2012-01-06 22:56:21 +01:00
hash-str.h	sync with scummvm	2011-05-18 23:33:39 +02:00
hashmap.cpp	sync with scummvm	2011-05-18 23:33:39 +02:00
hashmap.h	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
huffman.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
huffman.h	sync with scummvm	2012-01-06 22:56:21 +01:00
keyboard.h	sync with scummvm	2012-01-06 22:56:21 +01:00
list_intern.h	sync with scummvm	2011-05-18 23:33:39 +02:00
list.h	sync with scummvm	2011-05-18 23:33:39 +02:00
macresman.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
macresman.h	sync with scummvm	2011-05-18 23:33:39 +02:00
math.h	sync with scummvm	2012-01-06 22:56:21 +01:00
md5.cpp	sync with scummvm	2011-05-18 23:33:39 +02:00
md5.h	sync with scummvm	2011-05-18 23:33:39 +02:00
memory.h	sync with scummvm	2012-01-06 22:56:21 +01:00
memorypool.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
memorypool.h	sync with scummvm	2011-05-18 23:33:39 +02:00
memstream.h	sync with scummvm	2011-05-18 23:33:39 +02:00
module.mk	sync with scummvm	2012-01-06 22:56:21 +01:00
mutex.cpp	sync with scummvm	2011-05-18 23:33:39 +02:00
mutex.h	sync with scummvm	2011-05-18 23:33:39 +02:00
noncopyable.h	sync with scummvm	2011-05-18 23:33:39 +02:00
pack-end.h	sync with scummvm	2011-05-18 23:33:39 +02:00
pack-start.h	sync with scummvm	2011-05-18 23:33:39 +02:00
ptr.h	sync with scummvm	2012-01-06 22:56:21 +01:00
queue.h	sync with scummvm	2011-05-18 23:33:39 +02:00
random.cpp	sync with scummvm	2011-05-18 23:33:39 +02:00
random.h	sync with scummvm	2011-05-18 23:33:39 +02:00
rational.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
rational.h	sync with scummvm	2011-05-18 23:33:39 +02:00
rdft.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
rdft.h	sync with scummvm	2011-07-20 08:02:02 +02:00
rect.h	sync with scummvm	2011-05-18 23:33:39 +02:00
savefile.h	ALL: sync with scummvm	2011-06-09 11:17:15 +02:00
scummsys.h	sync with scummvm	2012-01-06 22:56:21 +01:00
serializer.h	sync with scummvm	2012-01-06 22:56:21 +01:00
sinetables.cpp	sync with scummvm	2011-07-20 08:02:02 +02:00
sinetables.h	sync with scummvm	2011-07-20 08:02:02 +02:00
singleton.h	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
stack.h	sync with scummvm	2011-05-18 23:33:39 +02:00
str-array.h	sync with scummvm	2011-05-18 23:33:39 +02:00
str.cpp	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
str.h	sync with scummvm	2012-01-06 22:56:21 +01:00
stream.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
stream.h	sync with scummvm	2011-05-18 23:33:39 +02:00
streamdebug.cpp	COMMON New overloads for unsigned int and double in Debug.	2011-10-18 17:46:29 +02:00
streamdebug.h	COMMON New overloads for unsigned int and double in Debug.	2011-10-18 17:46:29 +02:00
substream.h	sync with scummvm	2012-01-06 22:56:21 +01:00
system.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
system.h	sync with scummvm	2012-01-06 22:56:21 +01:00
taskbar.h	sync with scummvm	2012-01-06 22:56:21 +01:00
textconsole.cpp	sync with scummvm dated 03 july 2011	2011-07-20 06:58:19 +02:00
textconsole.h	sync with scummvm	2011-05-18 23:33:39 +02:00
timer.h	sync with scummvm	2012-01-06 22:56:21 +01:00
tokenizer.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
tokenizer.h	sync with scummvm	2011-05-18 23:33:39 +02:00
translation.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
translation.h	sync with scummvm	2012-01-06 22:56:21 +01:00
types.h	sync with scummvm	2011-05-18 23:33:39 +02:00
unzip.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
unzip.h	sync with scummvm	2011-05-18 23:33:39 +02:00
updates.h	sync with scummvm	2012-01-06 22:56:21 +01:00
util.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
util.h	sync with scummvm	2012-01-06 22:56:21 +01:00
xmlparser.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
xmlparser.h	sync with scummvm	2012-01-06 22:56:21 +01:00
zlib.cpp	sync with scummvm	2012-01-06 22:56:21 +01:00
zlib.h	sync with scummvm	2012-01-06 22:56:21 +01:00