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

Age	Commit message (Collapse)	Author
2009-04-16	svn merge -r117314:117337	Adam Moss
	svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-05	Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).	Eric Tulla
	No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
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-23	svn merge -r92720:92721 ↵	Karl Steifvater
	svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-22	svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> ↵	Josh Bell
	release Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22	merge uv-picking branch.	Karl Steifvater
	svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
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-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
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-09-28	EFFECTIVE MERGE: svn merge -r 68999:69916 ↵	Don Kjer
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-03-02	merge -r 58503:58641 maintenance -> release	Steven Bennetts

2007-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

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