diff options
author | Willem Jan Palenstijn | 2011-12-23 20:50:31 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-23 21:03:18 +0100 |
commit | d40201103e277dcaa55b98bca46157b80624d417 (patch) | |
tree | b8fdeb48c0ac72621adb84de8401089883404720 /rules.mk | |
parent | 625a5ef2ed8f947e43e8e8d12bd72ffe9d1776c6 (diff) | |
parent | c9e9e5d6d8da4bdd180b4934b1dd5c3ef7d77dbe (diff) | |
download | scummvm-rg350-d40201103e277dcaa55b98bca46157b80624d417.tar.gz scummvm-rg350-d40201103e277dcaa55b98bca46157b80624d417.tar.bz2 scummvm-rg350-d40201103e277dcaa55b98bca46157b80624d417.zip |
Merge pull request #151 from fingolfin/dreamweb-cleanup-rebased
Conflicts:
engines/dreamweb/dreamgen.cpp
engines/dreamweb/stubs.cpp
Diffstat (limited to 'rules.mk')
0 files changed, 0 insertions, 0 deletions