Files
Ansariel 4e0ad8a758 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/doxygen/CMakeLists.txt
#	indra/llcommon/indra_constants.h
#	indra/llmath/llmath.h
#	indra/llmath/llvolume.cpp
#	indra/llmath/v3dmath.h
#	indra/llmath/v4color.h
#	indra/llui/llchatentry.cpp
#	indra/llui/llchatentry.h
#	indra/llui/llfloater.h
#	indra/llui/llkeywords.h
#	indra/newview/llpanelprimmediacontrols.cpp
#	indra/newview/llpanelsnapshotinventory.cpp
#	indra/newview/llpanelsnapshotlocal.cpp
#	indra/newview/llpanelsnapshotoptions.cpp
#	indra/newview/llpanelsnapshotpostcard.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/de/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/es/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/it/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
#	indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
2025-04-18 19:56:20 +02:00
..
2024-05-22 22:40:26 +03:00
2024-05-22 22:40:26 +03:00
2024-05-22 22:40:26 +03:00
2024-05-22 22:40:26 +03:00