diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
| commit | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (patch) | |
| tree | b6d3a290333c72940b49ed4c930ff6858a59515e /core/os/mutex.h | |
| parent | a65edb4caabec21654c56552e11aacf0fd9291de (diff) | |
-fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
Diffstat (limited to 'core/os/mutex.h')
| -rw-r--r-- | core/os/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/mutex.h b/core/os/mutex.h index 512180d6c7..241d70e232 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -50,7 +50,7 @@ public: virtual void lock()=0; ///< Lock the mutex, block if locked by someone else virtual void unlock()=0; ///< Unlock the mutex, let other threads continue - virtual Error try_lock()=0; ///< Attempt to lock the mutex, true on success, false means it can't lock. + virtual Error try_lock()=0; ///< Attempt to lock the mutex, OK on success, ERROR means it can't lock. static Mutex * create(bool p_recursive=true); ///< Create a mutex |