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

Age	Commit message (Collapse)	Author
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-20	svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
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-07-11	svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵	Tess Chu
	svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

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-06-04	svn merge -r 62602:62831 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-30	merge -r61423:62602 svn/branches/maintenance --> release	Kelly Washington

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-05-01	svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵	Don Kjer
	into release
2007-04-11	svn merge -r 59968:60342 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> 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-09	svn merge -r 58902:58986 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-02-24	svn merge -r 58007:58273 ↵	Richard Nelson
	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-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-31	merge release@57486 release-candidate@57503	Steven Bennetts

2007-01-18	Result of svn merge -r56700:56797 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-17	merge release@56803 release-candidate@56833	Steven Bennetts

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