diff options
author | Strangerke | 2013-06-26 23:11:34 +0200 |
---|---|---|
committer | Strangerke | 2013-06-26 23:11:34 +0200 |
commit | 6e2d567bca53b6ffee771b4105e2e73dbd73f5b4 (patch) | |
tree | 9880f0c496263ffb6928248d495ce4172dabed18 /dists/engine-data | |
parent | ac387835e4527c1814919093b4e4bc9798d5742d (diff) | |
parent | 6716fa39a6fb2a3925576288c256688c5aadd7e9 (diff) | |
download | scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.gz scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.tar.bz2 scummvm-rg350-6e2d567bca53b6ffee771b4105e2e73dbd73f5b4.zip |
Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle
Conflicts:
engines/engines.mk
Diffstat (limited to 'dists/engine-data')
-rw-r--r-- | dists/engine-data/kyra.dat | bin | 471460 -> 486382 bytes |
-rw-r--r-- | dists/engine-data/neverhood.dat | bin | 0 -> 25416 bytes |
-rw-r--r-- | dists/engine-data/wintermute.zip | bin | 0 -> 4057 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 339b85664a..305c7e665c 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/dists/engine-data/neverhood.dat b/dists/engine-data/neverhood.dat Binary files differnew file mode 100644 index 0000000000..dc95c00965 --- /dev/null +++ b/dists/engine-data/neverhood.dat diff --git a/dists/engine-data/wintermute.zip b/dists/engine-data/wintermute.zip Binary files differnew file mode 100644 index 0000000000..924429972b --- /dev/null +++ b/dists/engine-data/wintermute.zip |