diff options
author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
tree | 40d464262da107ab5eed82f198685209161ebac1 /backends/modular-backend.h | |
parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/modular-backend.h')
-rw-r--r-- | backends/modular-backend.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/backends/modular-backend.h b/backends/modular-backend.h index b864da0df5..072ee805b6 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -105,13 +105,6 @@ public: //@} - /** @name Events and Time */ - //@{ - - virtual Common::HardwareKeySet *getHardwareKeySet() { return 0; } - - //@} - /** @name Mutex handling */ //@{ |