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

Age	Commit message (Collapse)	Author
2007-08-21	EFFECTIVE MERGE: svn merge -r 66133:68118 ↵	Christian Goetze
	svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
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-18	svn merge -r64837:65485 ↵	Bryan O'Sullivan
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-06-13	result of merge manually performed through diff and patch. svn diff ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 \| patch -p0 in release
2007-05-08	svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-04	svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
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-03-16	merge -r 59028:59178 maintenance -> release.	Steven Bennetts

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

2007-02-20	svn merge -r 57620:58007 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

2007-02-09	Result of svn merge -r57350:57790 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-05	merge -r 57517:57620 maintenance.	Steven Bennetts

2007-02-05	merge -r 57111:57464 maintenance.	Steven Bennetts

2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-03	corrected, removed, and updated comments throughout the code to be more ↵	Aaron Brashears
	useful. no code changes. SL-13762
2007-01-02	Print done when done.	James Cook