diff options
author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /common/taskbar.h | |
parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip |
Merge branch 'master' into xeen
Diffstat (limited to 'common/taskbar.h')
-rw-r--r-- | common/taskbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/taskbar.h b/common/taskbar.h index b4ec673739..f1a9adb2d9 100644 --- a/common/taskbar.h +++ b/common/taskbar.h @@ -123,7 +123,7 @@ public: virtual void addRecent(const String &name, const String &description) {} /** - * Notifies the user an error occured through the taskbar icon + * Notifies the user an error occurred through the taskbar icon * * This will for example show the taskbar icon as red (using progress of 100% and an error state) * on Windows, and set the launcher icon in the urgent state on Unity |