summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterproperties.cpp
AgeCommit message (Expand)Author
2009-08-28skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script...James Cook
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https:...Steven Bennetts
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-24svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-12-14svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenanc...Josh Bell
2007-11-01svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-03-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-02Print done when done.James Cook