viewer.git - Megapahit's fork of the Second Life viewer.

Age	Commit message (Collapse)	Author
2008-05-07	QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 ↵	Brian McGroarty
	svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-04-04	QAR-427	Steven Bennetts
	merge 3dconnex-merge -r 84010 : 84039 -> release
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2008-03-25	merge release@82858 maint-render-2-merge@83010 -> release	Steven Bennetts
	QAR-389
2008-02-27	Merge of windlight into release (QAR-286). This includes all changes in	Brad Kittenbrink
	windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-19	merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵	Steven Bennetts
	79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
2007-11-01	svn merge -r 71509:72877 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release Backport patches and translations from RC branch
2007-10-11	EFFECTIVE MERGE: svn merge -r 69928:70806 ↵	Don Kjer
	svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
2007-10-10	svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3	Christian Goetze

2007-10-04	Result of svn merge -r71162:71205 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-30	Merge sl-search-opt-in back into the release branch	Sam Kolb
	Reviewed by Josh and Don
2007-07-18	svn merge -r64837:65485 ↵	Bryan O'Sullivan
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-07-11	svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵	Tess Chu
	svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-06-04	svn merge -r 62602:62831 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-03-09	merge -r 58986:59028 maintenance	Steven Bennetts

2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

2007-01-17	merge release@56803 release-candidate@56833	Steven Bennetts

2007-01-03	corrected, removed, and updated comments throughout the code to be more ↵	Aaron Brashears
	useful. no code changes. SL-13762
2007-01-02	Print done when done.	James Cook