Skip to content
Snippets Groups Projects
  • Andrey Lihatskiy's avatar
    793bed7d
    Merge branch 'main' into DRTVWR-489 · 793bed7d
    Andrey Lihatskiy authored
    # Conflicts:
    #	indra/newview/fonts/DejaVu-license.txt
    #	indra/newview/fonts/DejaVuSans-Bold.ttf
    #	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
    #	indra/newview/fonts/DejaVuSans-Oblique.ttf
    #	indra/newview/fonts/DejaVuSans.ttf
    #	indra/newview/fonts/DejaVuSansMono.ttf
    793bed7d
    History
    Merge branch 'main' into DRTVWR-489
    Andrey Lihatskiy authored
    # Conflicts:
    #	indra/newview/fonts/DejaVu-license.txt
    #	indra/newview/fonts/DejaVuSans-Bold.ttf
    #	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
    #	indra/newview/fonts/DejaVuSans-Oblique.ttf
    #	indra/newview/fonts/DejaVuSans.ttf
    #	indra/newview/fonts/DejaVuSansMono.ttf
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
.gitignore 1.99 KiB