1 files changed, 100 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8f9c761..9b6d8a9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,8 +1,88 @@
+<<<<<<< HEAD:ChangeLog.txt
+2009-01-12  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llversionviewer.h
+        Changed version to RC1.
+
+
+        * linden/indra/llmath/llcalc.cpp:
+        Added cheat sheet help buttons in tools window, tweaked the layout a bit.
+        * linden/indra/newview/llpanelface.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelface.h:
+        Ditto.
+        * linden/indra/newview/llpanelobject.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelobject.h:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
+
+2009-01-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Added more gstreamer include paths.
+        * linden/install.xml:
+        Added glib package to install.xml.
+        * linden/indra/newview/CMakeLists.txt:
+        Use BOOST_SIGNALS_LIB in newview/CMakeLists.
+        * cmake/DBusGlib.cmake:
+        Removed references to unused dbusglib.
+        * newview/CMakeLists.txt:
+        Ditto.
+
+
+        McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llvieweraudio.cpp:
+        Wind disabled by default, ambient wind muting fixed, added debug setting 'MuteAudio'.
+        * linden/indra/newview/llvieweraudio.h:
+        Ditto.
+        * linden/indra/newview/app_settings/settings.xml:
+        Ditto.
+
+
+        Aimee Trescothick  <aimee@ama-zing.co.uk>
+        * linden/indra/llmath/llcalc.cpp:
+        Ability to do simple math in build editor.
+        * linden/indra/llmath/llcalc.h:
+        Ditto.
+        * linden/indra/llmath/llcalcparser.cpp:
+        Ditto.
+        * linden/indra/llmath/llcalcparser.h:
+        Ditto.
+        * linden/indra/llmath/CMakeLists.txt:
+        Ditto.
+        * linden/indra/llui/lllineeditor.cpp:
+        Ditto.
+        * linden/indra/llui/lllineeditor.h:
+        Ditto.
+        * linden/indra/llui/llspinctrl.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelface.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelobject.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+
+
+2009-01-10  Armin  <email@unknown.com>
+
+        * linden/indra/newview/llviewermenu.cpp:
+        Added 'create landmark' to land pie menu.
+        * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml:
+=======
 2009-01-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/llviewermenu.cpp:
         Backported 'report abuse' avatar pie menu option.
         * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml:
+>>>>>>> pieavreportabuse:ChangeLog.txt
         Ditto.
 
 
@@ -35,6 +115,14 @@
         * linden/indra/llwindow/llwindowsdl.cpp:
         Ditto.
 
+        * linden/indra/newview/llviewermenu.cpp:
+        Added shortcut and message to landmark creation.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/strings.xml:
+        Ditto.
+
+
 
 2008-12-30  McCabe Maxsted  <hakushakukun@gmail.com>
 
@@ -95,6 +183,12 @@
         Ditto.
 
 
+2008-12-24  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llwindebug.cpp:
+        Rebranded windows crash dump filenames.
+
+
 2008-12-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/install.xml:
@@ -134,6 +228,12 @@
         Backported from LL's 1.22 RC3.
 
 
+2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llappviewer.cpp:
+        Windows defaults to settings_imprudence.xml when run from the .exe.
+
+
 2008-12-01  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/app_settings/settings.xml: