Automated merge with...
Automated merge with bundle:c:\users\richard\appdata\local\temp\thg.qp3yns\ssh__richard@hg.lindenlab.com_sergeylproductengine_exp-1416__5pjppa.hg
No related branches found
No related tags found
Showing
- indra/llui/lldockablefloater.h 2 additions, 0 deletionsindra/llui/lldockablefloater.h
- indra/newview/app_settings/settings.xml 1 addition, 1 deletionindra/newview/app_settings/settings.xml
- indra/newview/llhudeffectblob.cpp 8 additions, 0 deletionsindra/newview/llhudeffectblob.cpp
- indra/newview/llhudeffectblob.h 2 additions, 0 deletionsindra/newview/llhudeffectblob.h
- indra/newview/llimview.cpp 2 additions, 0 deletionsindra/newview/llimview.cpp
- indra/newview/skins/default/xui/en/floater_voice_controls.xml 1 addition, 1 deletion...a/newview/skins/default/xui/en/floater_voice_controls.xml
- indra/newview/skins/default/xui/en/strings.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/strings.xml
Loading
Please register or sign in to comment