Merge branch 'master' into DRTVWR-534
# Conflicts: # indra/newview/VIEWER_VERSION.txt
Showing
- .hgtags 0 additions, 559 deletions.hgtags
- BuildParams 1 addition, 1 deletionBuildParams
- README.md 36 additions, 12 deletionsREADME.md
- autobuild.xml 29 additions, 29 deletionsautobuild.xml
- build.sh 16 additions, 0 deletionsbuild.sh
- debian/changelog 0 additions, 18 deletionsdebian/changelog
- debian/compat 0 additions, 1 deletiondebian/compat
- debian/control 0 additions, 16 deletionsdebian/control
- debian/copyright 0 additions, 32 deletionsdebian/copyright
- debian/postinst 0 additions, 43 deletionsdebian/postinst
- debian/postrm 0 additions, 41 deletionsdebian/postrm
- debian/preinst 0 additions, 39 deletionsdebian/preinst
- debian/prerm 0 additions, 42 deletionsdebian/prerm
- debian/rules 0 additions, 118 deletionsdebian/rules
- debian/source/lintian-overrides 0 additions, 8 deletionsdebian/source/lintian-overrides
- doc/contributions.txt 4 additions, 1 deletiondoc/contributions.txt
- doc/sl-logo.png 0 additions, 0 deletionsdoc/sl-logo.png
- indra/cmake/Variables.cmake 1 addition, 1 deletionindra/cmake/Variables.cmake
- indra/edit-me-to-trigger-new-build.txt 1 addition, 1 deletionindra/edit-me-to-trigger-new-build.txt
- indra/llappearance/llviewervisualparam.cpp 1 addition, 1 deletionindra/llappearance/llviewervisualparam.cpp
Loading
Please register or sign in to comment