diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store | |
parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store')
-rw-r--r-- | indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store | bin | 0 -> 12292 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store Binary files differnew file mode 100644 index 0000000000..a8b757372e --- /dev/null +++ b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store |