Merge remote-tracking branch 'origin/master' into soccer

Conflicts:
	engines/scumm/he/logic_he.cpp
	engines/scumm/he/logic_he.h

1 files changed, 2 insertions, 1 deletions

diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index 99ed56ead7..c0d456daaa 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -68,7 +68,7 @@ enum {
 class Button {
 public:
 	Button() { }
-	Button(Common::SeekableReadStream *stream, uint16 id);
+	Button(Common::SeekableReadStream *stream, uint16 id, uint gameType);
 
 	bool contains(const Common::Point &pos) const;
 
@@ -172,6 +172,7 @@ private:
 
 	Common::String getStringFromConfig(const Common::String &section, const Common::String &key);
 	Common::String getFilename(const Common::String &section, uint id);
+	Common::String mangleFilename(Common::String filename);
 	void loadLibrary(uint id);
 	void unloadLibrary(uint id);