David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 ... Self reviewed.		2009-09-22 11:11:45 +00:00
..
avatar	Merge of windlight into release (QAR-286). This includes all changes in	2008-02-27 18:58:14 +00:00
deferred	Merging render-pipeline-6-qa-2 into viewer-2	2009-09-22 11:11:45 +00:00
effects	Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)	2009-02-18 21:10:16 +00:00
environment	Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)	2009-02-18 21:10:16 +00:00
interface	Merge of windlight into release (QAR-286). This includes all changes in	2008-02-27 18:58:14 +00:00
lighting	merge release@82858 maint-render-2-merge@83010 -> release	2008-03-25 22:50:26 +00:00
objects	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
windlight	Merge of windlight into release (QAR-286). This includes all changes in	2008-02-27 18:58:14 +00:00