summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.h
AgeCommit message (Collapse)Author
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result 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-11Merge sl-search-m0 back into releaseSam Kolb
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
Reviewed by Josh and Don
2007-08-02Merge 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-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-01-23merge -r 56842:57026 maintenance.Steven Bennetts
2007-01-02Print done when done.James Cook