Ansariel 05ad4de150 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep ... # Conflicts: # indra/llxml/llcontrolgroupreader.h # indra/newview/llviewerkeyboard.cpp		2020-05-19 10:20:31 +02:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep	2020-05-19 10:20:31 +02:00
releasenotes-where.txt	…
translations.txt	…