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

Age	Commit message (Collapse)	Author
2010-02-06	Draw prims using triangle strips instead of triangle lists.	Dave Parks

2009-11-06	merge from texture-pipeline	Steve Bennetts

2009-11-06	merge QAR-1829: texture pipeline branch in viewer-2.0.0.3	Xiaohong Bao

2009-10-27	Extra debugging info for EXT-1456	Palmer
	Reviewed by Bao
2009-09-22	Merging render-pipeline-6-qa-2 into viewer-2	David Parks
	Self reviewed.
2009-07-10	merge QAR-1579: texture-cleanup-1.	Xiaohong Bao

2009-02-18	Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵	Brad Kittenbrink
	(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
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-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-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-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-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-03-21	svn merge -r 59178:59364 ↵	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-01-04	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui// (from maintenance r55380) - XML processing instruction went AWOL
2007-01-02	Print done when done.	James Cook