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

Age	Commit message (Collapse)	Author
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 124105-124625 skinning-13 -> viewer-2.0.0-3	Steven Bennetts

2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
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-07-22	QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release	Steven Bennetts
	merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
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-20	svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7	Tess Chu

2007-11-15	svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer ↵	Tess Chu
	auth merge
2007-11-15	svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6	Tess Chu

2007-10-17	QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4	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-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-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-26	land mozilla-https-fix branch, -> release	Adam Moss

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-01-02	Print done when done.	James Cook