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-11-07	QAR-992 Merging revisions 101012-101170,101686-101687 of ↵	Mark Palange
	svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-09-23	QAR-849 merge maint-viewer-10-merge 96838-97237 -> release	Steven Bennetts

2008-09-12	QAR-855 Viewer 1.21 RC 2	Steven Bennetts
	merge viewer_1-21 94770-96059 -> release
2008-08-12	QAR-767 Combined maint-render-7 and maint-viewer-9 merge	Steven Bennetts
	merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-06-06	QAR-650 - Viewer RC 9 merge -> release (post cmake)	Steven Bennetts
	merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-08	QAR-570 maint-render-4 merge	Steven Bennetts
	merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-04-28	merge release-QAR-499 Viewer 1.20 RC 3	Steven Bennetts
	merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28	merge release-QAR-499 Viewer 1.20 RC 2 (additional changes)	Steven Bennetts
	merge Branch_1-20-Viewer -r 85100 : 85278 -> release
2008-04-03	1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426	Steven Bennetts
	QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
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
2007-11-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

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-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-05-23	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵	Brad Kittenbrink
	svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-03-31	svn merge -r 59364:59813 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-03-02	merge -r 58503:58641 maintenance -> release	Steven Bennetts

2007-01-02	Print done when done.	James Cook