Go to file
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
2020-04-23 19:21:00 +02:00
debian try to suppress some debian errors we don't care about 2015-11-10 09:55:05 -05:00
doc Merge branch 'master' of D:/Dev/phoenix-firestorm-camus 2020-04-23 19:14:47 +02:00
etc Merge axon 2017-09-20 01:09:14 +02:00
indra Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 2020-04-23 19:21:00 +02:00
scripts Linux always builds (and always had been built) with OpenAL, make sure it is always enabled. 2020-02-15 10:22:19 +01: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 Great job again, Git... 2020-01-29 00:05:10 +01: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 tip to default branch. 2014-12-12 09:36:00 +01:00
README_BUILD_FIRESTORM_WINDOWS.txt Line ending normalization 2020-01-16 01:07:18 +01:00
autobuild.xml FMOD Studio updated to 2.00.08 for Linux and macOS. 2020-04-12 09:02:07 -05:00
build.sh Merge DRTVWR-496 2020-01-28 18:18:12 +01:00