Andrey Lihatskiy d6480e2b7f Merge branch 'master' into DRTVWR-483 ... # Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp		2020-11-11 22:54:23 +02: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-483	2020-11-11 22:54:23 +02: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