diff options
author | McCabe Maxsted | 2009-03-26 13:53:42 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-03-26 13:53:42 -0700 |
commit | 0fb7f4e3e48a6dad279854c64410fd09ccb9226e (patch) | |
tree | 12629d0ae8a339100d520fa0c0a74e08f70899de /linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc | |
parent | Ghost files, ignore this commit (diff) | |
parent | Fixed/improved how slvideo gst plugin is registered. (diff) | |
download | meta-impy-0fb7f4e3e48a6dad279854c64410fd09ccb9226e.zip meta-impy-0fb7f4e3e48a6dad279854c64410fd09ccb9226e.tar.gz meta-impy-0fb7f4e3e48a6dad279854c64410fd09ccb9226e.tar.bz2 meta-impy-0fb7f4e3e48a6dad279854c64410fd09ccb9226e.tar.xz |
Fixed merge conflict
Diffstat (limited to 'linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc')
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc deleted file mode 100644 index 0be99b5..0000000 --- a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | |||
2 | // required symbols to grab | ||
3 | LL_GST_SYM(true, gst_audio_sink_get_type, GType, void); | ||
4 | |||
5 | // optional symbols to grab | ||