Go to file
Ansariel f22474724e Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/newview/llprogressview.cpp
#	indra/newview/viewer_manifest.py
2020-04-23 19:36:46 +02:00
debian
…
doc Merge branch 'master' 2020-04-23 17:40:31 +02:00
etc
…
indra Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer 2020-04-23 19:36:46 +02:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-04-23 19:33:13 +02:00
.clang-format Convert ignore file to git, add a .clang-format rules file 2020-01-10 16:27:33 -07:00
.gitattributes More line ending normalization madness 2020-01-16 09:35:33 +01:00
.gitignore Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer 2020-04-10 18:37:27 +02:00
BuildParams Merge LL viewer release 5.1.0 2018-01-16 23:03:20 +01:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt It's 2020... 2020-01-01 13:48:19 +01:00
README_BUILD_FIRESTORM_LINUX.txt Tip to default. 2019-09-22 12:07:18 +02:00
README_BUILD_FIRESTORM_MACOSX.txt
…
README_BUILD_FIRESTORM_WINDOWS.txt Line ending normalization 2020-01-16 01:07:18 +01:00
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-04-23 19:33:13 +02:00
build.sh Merge DRTVWR-496 2020-01-28 18:18:12 +01:00