summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/foldertypes.xml
AgeCommit message (Expand)Author
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-23svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih