diff options
| author | Tony Puccinelli | 2010-08-11 00:54:34 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-08-11 00:54:34 +0000 |
| commit | 6543062e5701e8011a4b12abffa8afca56f30b3f (patch) | |
| tree | 2a317b820d5a7feeb903aaeec3c1f37847d21ee5 /base/commandLine.h | |
| parent | 682807f0e916b189c69b60765418ee1ccc327cbf (diff) | |
| parent | fffec23a02cc88ed8daba0a3b50007b7e220c075 (diff) | |
| download | scummvm-rg350-6543062e5701e8011a4b12abffa8afca56f30b3f.tar.gz scummvm-rg350-6543062e5701e8011a4b12abffa8afca56f30b3f.tar.bz2 scummvm-rg350-6543062e5701e8011a4b12abffa8afca56f30b3f.zip | |
manually merged base, graphics, common, sound, and gui as I am quite skilled at somehow messing up svn merge :-)
svn-id: r51963
Diffstat (limited to 'base/commandLine.h')
| -rw-r--r-- | base/commandLine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/commandLine.h b/base/commandLine.h index 8801ed17d8..c7e8d8b0d0 100644 --- a/base/commandLine.h +++ b/base/commandLine.h @@ -33,7 +33,7 @@ namespace Base { void registerDefaults(); Common::String parseCommandLine(Common::StringMap &settings, int argc, const char * const *argv); -bool processSettings(Common::String &command, Common::StringMap &settings); +Common::Error processSettings(Common::String &command, Common::StringMap &settings); } // End of namespace Base |