diff options
| author | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-31 14:45:10 -0400 |
| commit | e5296ebf8dd09f603499b1894a33865ec71bb28f (patch) | |
| tree | d7de032efd54dfdb3159cbc778a0c9ce8cd8aa91 /engines/zvision/detection.h | |
| parent | 673537bad93f0b440172a0cc263ebf19cc95ffc0 (diff) | |
| parent | 141ff4d08dc24b6bb17098bd71801e2a58e6a38f (diff) | |
| download | scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.gz scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.tar.bz2 scummvm-rg350-e5296ebf8dd09f603499b1894a33865ec71bb28f.zip | |
Merge branch 'master' into phantom
Diffstat (limited to 'engines/zvision/detection.h')
| -rw-r--r-- | engines/zvision/detection.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h index a788e710b7..f80cac79ec 100644 --- a/engines/zvision/detection.h +++ b/engines/zvision/detection.h @@ -25,7 +25,6 @@ #include "engines/advancedDetector.h" - namespace ZVision { enum ZVisionGameId { |