diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-23 09:13:01 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-23 09:13:01 +0000 |
| commit | 35508d7a998ab61228ebf980ffbe7dfbf93d84ea (patch) | |
| tree | c81d901e082afe63e36569df90adc8dbb03e81e5 /Externals/wxWidgets3/src/generic/timer.cpp | |
| parent | c990f1293229f54fab44a9e151980d2fb2e8fee7 (diff) | |
Update to wxWidgets r67291.
Fixes a wxFileSelector regression on OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Externals/wxWidgets3/src/generic/timer.cpp')
| -rw-r--r-- | Externals/wxWidgets3/src/generic/timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Externals/wxWidgets3/src/generic/timer.cpp b/Externals/wxWidgets3/src/generic/timer.cpp index b19e261d36..e7d67f9942 100644 --- a/Externals/wxWidgets3/src/generic/timer.cpp +++ b/Externals/wxWidgets3/src/generic/timer.cpp @@ -2,7 +2,7 @@ // Name: src/generic/timer.cpp // Purpose: wxTimer implementation // Author: Vaclav Slavik -// Id: $Id: timer.cpp 64656 2010-06-20 18:18:23Z VZ $ +// Id: $Id: timer.cpp 67280 2011-03-22 14:17:38Z DS $ // Copyright: (c) Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ #ifdef __DOS__ // Under DOS the MGL timer has a 24hr period, so consider the 12 hours - // before y to be 'less' and the the 12 hours after 'greater' modulo + // before y to be 'less' and the 12 hours after 'greater' modulo // 24 hours. inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) { |