summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-02-01 02:23:35 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-02-01 02:23:35 +0000
commitb302f15deea0f4f7f5de75bfd3776c17021b6444 (patch)
tree7a2842445c8dd6c8537bd9f8d4d171e95b85a845 /indra/newview/llvoiceclient.cpp
parent6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (diff)
EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
0 files changed, 0 insertions, 0 deletions