diff options
author | Jason Sams <jsams@google.com> | 2012-02-07 16:40:51 -0800 |
---|---|---|
committer | Jason Sams <jsams@google.com> | 2012-02-07 16:40:51 -0800 |
commit | d3e4b744900ed6666f4dd3182ad5443be26c96dd (patch) | |
tree | 1cc74f17c92ba8f38f37cd920cbcca2740c58ca4 /rs.spec | |
parent | 55b817ad2ea20e62936bbe1c96d693a4efc80d31 (diff) | |
parent | 5f27d6fb0b0b9184ba9820c629fc1354a635e515 (diff) | |
download | rs-d3e4b744900ed6666f4dd3182ad5443be26c96dd.tar.gz |
Merge commit 'bdeec118' into manualmerge
Conflicts:
libs/rs/rsThreadIO.h
Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
Diffstat (limited to 'rs.spec')
-rw-r--r-- | rs.spec | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -119,6 +119,7 @@ ContextSetPriority { } ContextDestroyWorker { + sync } AssignName { |