Don Kjer b089fc559a EFFECTIVE MERGE: svn merge -r 68999:69916 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-09-28 23:32:53 +00:00
..
FLOSS-exception.txt	Use actual planned license header (GPL, FLOSS exception, alternative available)	2007-01-06 01:31:14 +00:00
GPL-license.txt	Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for	2007-01-04 02:00:37 +00:00
LICENSE-logos.txt	merge release@58699 beta-1-14-0@58707 -> release	2007-03-02 21:25:50 +00:00
LICENSE-source.txt	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry	2007-01-10 21:54:56 +00:00
contributions.txt	EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release	2007-09-28 23:32:53 +00:00