Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

1e851a2e

Commit 1e851a2e authored 10 years ago by Oz Linden

Downloads
- Patches
- Plain Diff

correct bad merges from 3.7.7-release

parent a98b4b6b

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llkeywords.cpp 2 additions, 2 deletions

indra/llui/llkeywords.cpp
indra/llui/lltexteditor.cpp 17 additions, 11 deletions

indra/llui/lltexteditor.cpp
indra/newview/llappearancemgr.cpp 2 additions, 2 deletions

indra/newview/llappearancemgr.cpp
indra/newview/llscripteditor.cpp 3 additions, 3 deletions

indra/newview/llscripteditor.cpp

with 24 additions and 18 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