Go to file
Ansariel fe10f171d3 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +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 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-08-11 01:34:13 +03:00
etc Merge axon 2017-09-20 01:09:14 +02:00
indra Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-09 19:34:33 +02:00
scripts Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +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 remote-tracking branch 'fs/master' into fs-vs2017-d476 2020-07-20 09:58:30 +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 Update README_BUILD_FIRESTORM_LINUX.txt to reflect the need for GCC 5.4 2020-07-24 00:25:20 +02:00
README_BUILD_FIRESTORM_MACOSX.txt tip to default branch. 2014-12-12 09:36:00 +01:00
README_BUILD_FIRESTORM_WINDOWS.txt Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
autobuild.xml Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-09 19:34:33 +02:00
build.sh Merge branch 'master' into fs-vs2017 2020-04-29 20:02:19 +02:00