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

Age	Commit message (Collapse)	Author
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
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-12-19	svn merge -r 75354:76103 ↵	Jon Wolk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-12-05	EFFECTIVE MERGE: svn merge -r 71520:73420 ↵	Don Kjer
	svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
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-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

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-17	QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4	Christian Goetze

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-21	EFFECTIVE MERGE: svn merge -r 66133:68118 ↵	Christian Goetze
	svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-02	Merge down from Branch_1-18-1:	Monroe Williams
	svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-06-29	revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into ↵	Don Kjer
	release reverting jakes accidental check in
2007-06-29	Changes to make Logitech code more LL Code Standards compliant, plus remove ↵	Jake Simpson
	all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
2007-05-08	Removing Logitech LCD code: svn merge -r 60616:60615 ↵	Don Kjer
	svn+ssh://svn/svn/linden/release into release
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-04-18	svn merge -r 59608:60615 ↵	Jake Simpson
	svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-02-27	merge -r 58285:58437 maintenance.	Steven Bennetts

2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02	Print done when done.	James Cook