diff options
author | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
---|---|---|
committer | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /src/gallium/auxiliary/os | |
parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) |
Merge branch '7.8'
Diffstat (limited to 'src/gallium/auxiliary/os')
-rw-r--r-- | src/gallium/auxiliary/os/os_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/os/os_time.h b/src/gallium/auxiliary/os/os_time.h index 5b55c1b3747..7e0f67a76b0 100644 --- a/src/gallium/auxiliary/os/os_time.h +++ b/src/gallium/auxiliary/os/os_time.h @@ -71,7 +71,7 @@ os_time_sleep(int64_t usecs); /* * Helper function for detecting time outs, taking in account overflow. * - * Returns true the the current time has elapsed beyond the specified interval. + * Returns true if the current time has elapsed beyond the specified interval. */ static INLINE boolean os_time_timeout(int64_t start, |