Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

e1714497

Commit e1714497 authored 4 years ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'master' into sdl2

parents cf36b826 a1020c96

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 7 deletions

.gitignore
autobuild.xml 13 additions, 11 deletions

autobuild.xml
indra/cmake/00-Common.cmake 5 additions, 0 deletions

indra/cmake/00-Common.cmake
indra/cmake/Copy3rdPartyLibs.cmake 1 addition, 0 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/WebP.cmake 4 additions, 1 deletion

indra/cmake/WebP.cmake
indra/llcommon/is_approx_equal_fraction.h 1 addition, 1 deletion

indra/llcommon/is_approx_equal_fraction.h
indra/llcommon/llsdserialize.cpp 10 additions, 8 deletions

indra/llcommon/llsdserialize.cpp
indra/llcommon/llsdserialize_xml.cpp 5 additions, 4 deletions

indra/llcommon/llsdserialize_xml.cpp
indra/llui/lldockcontrol.cpp 6 additions, 1 deletion

indra/llui/lldockcontrol.cpp
indra/llui/lldockcontrol.h 1 addition, 0 deletions

indra/llui/lldockcontrol.h
indra/newview/viewer_manifest.py 2 additions, 0 deletions

indra/newview/viewer_manifest.py

with 49 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment