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

Age	Commit message (Collapse)	Author
2009-10-29	Fixed some outlines being 1 pixel away from color swatches. Not reviewed.	James Cook

2009-08-04	svn merge -r 128442:129343 ↵	Richard Nelson
	svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-10	merge QAR-1579: texture-cleanup-1.	Xiaohong Bao

2009-07-06	Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵	James Cook
	UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
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-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-23	QAR-488 Viewer 1.20 RC 2	Steven Bennetts
	merge Branch_1-20-Viewer -r 84760 : 85100 -> 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
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
2007-11-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

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-04-05	svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ↵	Richard Nelson
	release
2007-03-31	svn merge -r 59364:59813 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-09	svn merge -r 56560:56599 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-02	Print done when done.	James Cook