Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llui/lllineeditor.cpp # indra/llui/llmenugl.cpp # indra/llui/llmenugl.h # indra/llui/lltexteditor.cpp # indra/newview/llfloaterbump.cpp # indra/newview/llfloaterbump.h # indra/newview/llinventorypanel.cpp # indra/newview/llnetmap.cpp		2022-10-20 10:51:25 +02:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
LICENSE-source.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
contributions.txt	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-20 10:51:25 +02:00
releasenotes-where.txt	…
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	…