Andrey Lihatskiy a0d7d87355 Merge branch 'master' into DRTVWR-460 ... # Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml		2020-04-26 21:57:40 +03:00
..
LGPL-licence.txt	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
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 'master' into DRTVWR-460	2020-04-26 21:57:40 +03:00
releasenotes-where.txt	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
translations.txt	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00