Age | Commit message (Collapse) | Author |
|
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
|
|
|
|
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Viewer (repository: axon)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
viewer-bear
|
|
|
|
|
|
needed. Remove pointless in-progress notice
|
|
|
|
|
|
|
|
|
|
contribution this time), from 391-blizzard branch
|
|
|
|
|
|
viewer-lynx)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
missing translation after the last merge
|
|
|
|
|
|
|
|
latest merge with viewer-development)
|
|
|