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

Age	Commit message (Collapse)	Author
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-06-04	svn merge -r 62602:62831 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> 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-07	Fixed Mac compiler warnings for deployment builds.	James Cook

2007-03-31	svn merge -r 59364:59813 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-20	svn merge -r59459:59476 ↵	Karen Clark
	svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-09	merge -r 58986:59028 maintenance	Steven Bennetts

2007-03-09	svn merge -r 58902:58986 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-06	merge -r 58734:58751 maintenance -> release	Steven Bennetts

2007-03-06	merge -r 58641:58711 maintenance -> release	Steven Bennetts

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-03-01	svn merge -r 58437:58503 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-24	svn merge --ignore-ancestry -r 58273:58283 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance The diff is basically a no-op since it's a reverse-merge from release itself. However, several things tried to come along for the ride, so I inspected them carefully: * Reverted libcurl changes which tried to migrate back from maintenance (see r58322) * Reverted debugging output in lltooldraganddrop.cpp, which had been added then removed again * Reverted false-positive binary conflict in libgtk-x11-2.0.so * Reverted false-positive whitespace (?) conflicts in llmail.cpp, and lldataconnector.cpp * Left a whitespace change in llselectmgr.cpp so there was something to commit
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-19	SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner ↵	James Cook
	commands not putting transaction ids into a packet. Reviewed with Kelly.
2007-01-17	merge release@56803 release-candidate@56833	Steven Bennetts

2007-01-15	svn merge -r 56599:56738 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
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