2 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 7e2833a..32c4376 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -84,7 +84,7 @@ public:
                                   GstMessage *message);
 
         // basic log file writing
-        static bool writeToLog(char* str, ...);
+        static bool writeToLog(const char* str, ...);
 
 private:
         std::string getVersion();
@@ -202,7 +202,7 @@ static char* get_gst_state_name(GstState state)
 #endif // LL_GST_REPORT_STATE_CHANGES
 
 // static
-bool MediaPluginGStreamer010::writeToLog(char* str, ...)
+bool MediaPluginGStreamer010::writeToLog(const char* str, ...)
 {
         LLFILE* fp = LLFile::fopen("media_plugin_gstreamer010.log", "a");
 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 56c2410..6bca6e0 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -134,7 +134,6 @@ class ViewerManifest(LLManifest):
             self.path("README.txt")
             self.path("MANIFESTO.txt")
             self.path("CONTRIBUTE.txt")
-            self.path("RELEASE_NOTES.txt")
             self.path("ChangeLog.txt", required=False)
             self.end_prefix("../../..")