diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /graphics/palette.h | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'graphics/palette.h')
| -rw-r--r-- | graphics/palette.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/palette.h b/graphics/palette.h index 7eedb0f78d..77891c3fdc 100644 --- a/graphics/palette.h +++ b/graphics/palette.h @@ -55,7 +55,7 @@ public: * @param start the first palette entry to be updated * @param num the number of palette entries to be updated * - * @note It is an error if start+num exceeds 256, behaviour is undefined + * @note It is an error if start+num exceeds 256, behavior is undefined * in that case (the backend may ignore it silently or assert). * @note It is an error if this function gets called when the pixel format * in use (the return value of getScreenFormat) has more than one |