Shyotl e8ce35ebf8 Merge branch 'master' into UICleanup ...

Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp

2013-05-03 21:41:51 -05:00

..

en-us

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

es

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

fr

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

pt

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00