diff options
author | Jacek Antonelli | 2009-04-06 01:32:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-06 01:34:44 -0500 |
commit | f3d08c4bed781ea455f0b60ebc294423eb559025 (patch) | |
tree | d13d3f52eb783ad43a26ff6f09b1b99b7970bd2a /linden/indra/llcommon/llthread.h | |
parent | Merge commit 'mccabe/gst-revamp' into gst-revamp (diff) | |
parent | LLMediaImplGStreamer creates new thread for playing. (diff) | |
download | meta-impy-f3d08c4bed781ea455f0b60ebc294423eb559025.zip meta-impy-f3d08c4bed781ea455f0b60ebc294423eb559025.tar.gz meta-impy-f3d08c4bed781ea455f0b60ebc294423eb559025.tar.bz2 meta-impy-f3d08c4bed781ea455f0b60ebc294423eb559025.tar.xz |
Merge branch gst-thread into gst-revamp
Conflicts:
linden/indra/llmedia/llmediaimplgstreamer.cpp
Diffstat (limited to 'linden/indra/llcommon/llthread.h')
0 files changed, 0 insertions, 0 deletions