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

Age	Commit message (Collapse)	Author
2009-03-13	svn merge -r114093:114412 ↵	Christian Goetze
	svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-02-03	QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme	Adam Moss
	svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
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-12-15	svn merge -r105329:105903 ↵	Melinda Green
	svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-08-13	QAR-782 Merge featurettes batch #2	Steven Bennetts
	merge featurettes-6-merge-2 -> 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-06-02	svn merge -r88066:88786 ↵	Bryan O'Sullivan
	svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-04-30	svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 ↵	James Cook
	maint-ui-11-qa).
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-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2008-03-04	svn merge -r 81304:81392 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge QAR-343 - merge maint-ui-7 and maint-ui-8 to release
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-12-19	svn merge -r 75354:76103 ↵	Jon Wolk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
2007-11-21	svn merge -r 73148:74186 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
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-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
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-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-05-08	Removing Logitech LCD code: svn merge -r 60616:60615 ↵	Don Kjer
	svn+ssh://svn/svn/linden/release into 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-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02	Print done when done.	James Cook