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

Age	Commit message (Collapse)	Author
2009-11-06	merge QAR-1829: texture pipeline branch in viewer-2.0.0.3	Xiaohong Bao

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-10-09	QAR-907: svn merge -r 98908:98910 ↵	Don Kjer
	svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-07-31	svn merge -r93014:93396 ↵	Dave Hiller
	svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-04-03	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	Kelly Washington
	HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2007-12-21	svn merge -r74200:76302 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-04	EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release	Steven Bennetts
	ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-03	-74901 (back out premature commit to release)	Steven Bennetts

2007-12-03	merge -r 73391:74133 maint-ui-3 -> release	Steven Bennetts

2007-11-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

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-29	svn merge -r67650:68653 branches/release-viewer-stats	Bryan O'Sullivan
	Branch reviewed by Don. Passed QA buildme this morning. NOTE: This change requires a DB schema upgrade. Upgrade script: indra/upgrade/viewer-stats/redo_viewer_stats
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-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-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-01-23	merge -r 56842:57026 maintenance.	Steven Bennetts

2007-01-02	Print done when done.	James Cook