Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelavatar.cpp
|
|
|
|
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
|
|
|
|
|
|
|
|
483-legacy_profiles
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|