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

Age	Commit message (Collapse)	Author
2009-01-08	Result of svn merge -r107256:107258 ↵	Aaron Brashears
	svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-07-15	svn merge -r 90938:92097 ↵	Jon Wolk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-06-07	svn merge -r 88991:89027 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
2008-02-14	svn merge -r 79730:79944 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2007-11-15	merge of age verification changes from QAR-76 to release; changes were ↵	Kent Quirk
	originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-01	svn merge -r 72652:72881 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam.
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-10-04	Result of svn merge -r70873:71086 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-06-13	result of merge manually performed through diff and patch. svn diff ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 \| patch -p0 in release
2007-05-08	svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-01	svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵	Don Kjer
	into release
2007-01-02	Print done when done.	James Cook