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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | linden/indra/llmedia/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt index 026afc1..0440153 100644 --- a/linden/indra/llmedia/CMakeLists.txt +++ b/linden/indra/llmedia/CMakeLists.txt | |||
| @@ -30,7 +30,6 @@ set(llmedia_SOURCE_FILES | |||
| 30 | llmediaimplfactory.cpp | 30 | llmediaimplfactory.cpp |
| 31 | llmediamanager.cpp | 31 | llmediamanager.cpp |
| 32 | llmediaimplgstreamer.cpp | 32 | llmediaimplgstreamer.cpp |
| 33 | llmediaimplgstreamer_syms.cpp | ||
| 34 | llmediaimplgstreamervidplug.cpp | 33 | llmediaimplgstreamervidplug.cpp |
| 35 | ) | 34 | ) |
| 36 | 35 | ||
| @@ -48,7 +47,6 @@ set(llmedia_HEADER_FILES | |||
| 48 | llmediaobserver.h | 47 | llmediaobserver.h |
| 49 | llmediaimplgstreamer.h | 48 | llmediaimplgstreamer.h |
| 50 | llmediaimplgstreamervidplug.h | 49 | llmediaimplgstreamervidplug.h |
| 51 | llmediaimplgstreamer_syms.h | ||
| 52 | ) | 50 | ) |
| 53 | 51 | ||
| 54 | # Work around a bad interaction between broken gstreamer headers and | 52 | # Work around a bad interaction between broken gstreamer headers and |