[Scummvm-cvs-logs] scummvm master -> d40201103e277dcaa55b98bca46157b80624d417

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d40201103e Merge pull request #151 from fingolfin/dreamweb-cleanup-rebased


Commit: d40201103e277dcaa55b98bca46157b80624d417
    https://github.com/scummvm/scummvm/commit/d40201103e277dcaa55b98bca46157b80624d417
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-23T12:03:18-08:00

Commit Message:
Merge pull request #151 from fingolfin/dreamweb-cleanup-rebased

Conflicts:
	engines/dreamweb/dreamgen.cpp
	engines/dreamweb/stubs.cpp

Changed paths:
  A engines/dreamweb/newplace.cpp
  A engines/dreamweb/titles.cpp
    devtools/tasmrecover/tasm-recover
    engines/dreamweb/dreambase.h
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/module.mk
    engines/dreamweb/object.cpp
    engines/dreamweb/saveload.cpp
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h
    engines/dreamweb/talk.cpp
    engines/dreamweb/use.cpp
    engines/dreamweb/vgafades.cpp