Joel Teichroeb ee412e972b ALL: Fix merge

2014-05-24 22:53:30 -07:00

..

commandLine.cpp

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

commandLine.h

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

internal_revision.h.in

ALL: decrease diffs with scummvm

2012-02-22 23:26:36 +01:00

internal_version.h

ALL: update version for master branch

2012-03-11 18:23:51 +01:00

internal_version.h.in

ALL: decrease diffs with scummvm

2012-02-22 23:26:36 +01:00

main.cpp

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

main.h

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

module.mk

import some code from scummvm to allow implement later multi engine support

2009-05-24 21:31:05 +00:00

plugins.cpp

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

plugins.h

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00

version.cpp

ALL: Fix merge

2014-05-24 22:53:30 -07:00

version.h

ALL: synced with ScummVM

2014-04-05 18:18:42 +02:00