summaryrefslogtreecommitdiff
path: root/indra/llinventory/llpermissions.h
AgeCommit message (Expand)Author
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-02-28svn merge -r 80357:80990 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-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...Aaron Brashears
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-01-02Print done when done.James Cook