diff options
author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /engines/gob/global.h | |
parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'engines/gob/global.h')
-rw-r--r-- | engines/gob/global.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/gob/global.h b/engines/gob/global.h index fa2f2c9637..175331dd83 100644 --- a/engines/gob/global.h +++ b/engines/gob/global.h @@ -127,7 +127,6 @@ public: SurfacePtr _primarySurfDesc; int16 _debugFlag; - int16 _inVM; int16 _inter_animDataSize; |