summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-05-06 13:36:08 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-05-06 13:36:08 -0700
commit483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f (patch)
treef316cccce1332aa656d91db487167014b4b932d0 /indra/newview/lltoolmorph.h
parent4015e6b3c7b4ff34bd679618f2231b2f53258db4 (diff)
EXP-769: "Group call requests received in Basic mode"
fixing merge error
Diffstat (limited to 'indra/newview/lltoolmorph.h')
0 files changed, 0 insertions, 0 deletions