10 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author	SHA1	Message	Date
Steven Bennetts	9ec432034d	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ... ignore-dead-branch	2009-06-21 08:04:56 +00:00
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
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Kent Quirk	667ca55bad	svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.	2009-01-05 18:59:12 +00:00
James Cook	2b863df7c8	svn merge -r87877:87878 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes.	2008-05-20 23:24:16 +00:00
Josh Bell	78aec043f3	svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release	2007-11-21 02:10:12 +00:00
Josh Bell	7afa8058aa	svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release ... QAR-11: pair-reviewed the merge w/ Sam.	2007-11-01 22:02:35 +00:00
Aaron Brashears	5595a99623	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
Josh Bell	ea8fb7238e	svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release	2007-03-31 01:41:19 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00