Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 ... svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql		2009-05-04 17:43:26 +00:00
..
FLOSS-exception.txt	Use actual planned license header (GPL, FLOSS exception, alternative available)	2007-01-06 01:31:14 +00:00
GPL-license.txt	Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for	2007-01-04 02:00:37 +00:00
LICENSE-logos.txt	DEV-12322 - text file - CC By-SA 3.0 upgrade: edit LICENSE-logos.txt in bin and source	2008-03-27 23:10:30 +00:00
LICENSE-source.txt	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry	2007-01-10 21:54:56 +00:00
contributions.txt	QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3	2009-05-04 17:43:26 +00:00
releasenotes-where.txt	merge viewer/viewer_1-21 94170-94770 -> release	2008-08-28 23:57:41 +00:00