summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
AgeCommit message (Expand)Author
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC...Mark Palange
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-13merge elar-merge-3 -r 79884 : 79923 -> releaseSteven Bennetts
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-11-15merge of age verification changes from QAR-76 to release; changes were origin...Kent Quirk
2007-11-01svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
2007-02-09Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patche...Aaron Brashears
2007-02-05merge -r 57111:57464 maintenance.Steven Bennetts
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook