Fixed merge conflict

1 files changed, 31 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b897c39..1844521 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,34 @@
+2009-03-26  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamervidplug.cpp:
+        Fixed/improved how slvideo gst plugin is registered.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer_syms.cpp:
+        Removed obsolete gstreamer_syms files.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms.h:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc:
+        Ditto.
+
+        
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Removed all that llgst and symbol grabbing silliness.
+        Some symbols require gstreamer >= 0.10.11.
+        * linden/indra/llmedia/llmediaimplgstreamervidplug.cpp:
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt:
+        Ditto.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Link with some gstreamer core libs on Linux.
+
+
 2009-03-22  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/llappviewer.cpp: