aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/CMakeLists.txt
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-26 16:58:13 -0700
committerMcCabe Maxsted2009-03-26 16:58:13 -0700
commit1ddee2fea92e3409680c192973e40eaee6206f0e (patch)
tree31941b6c681eb61f80acba4248fb2e127c2362a4 /linden/indra/llmedia/CMakeLists.txt
parentConverted all skin XML files to Unix LF line endings. (diff)
parentFixed merge conflict (diff)
downloadmeta-impy-1ddee2fea92e3409680c192973e40eaee6206f0e.zip
meta-impy-1ddee2fea92e3409680c192973e40eaee6206f0e.tar.gz
meta-impy-1ddee2fea92e3409680c192973e40eaee6206f0e.tar.bz2
meta-impy-1ddee2fea92e3409680c192973e40eaee6206f0e.tar.xz
Merge branch 'gst-revamp' into lineendings
Diffstat (limited to 'linden/indra/llmedia/CMakeLists.txt')
-rw-r--r--linden/indra/llmedia/CMakeLists.txt2
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