Merged from trunk, from Rev 49499 to HEAD

svn-id: r50840
This commit is contained in:
Alejandro Marzini 2010-07-13 04:31:15 +00:00
commit 609e08d5db
608 changed files with 146447 additions and 31050 deletions

View file

@ -76,7 +76,7 @@ public:
virtual int getGraphicsMode() const;
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const;
virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
#endif
virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL);
virtual int getScreenChangeID() const;