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.

438ceeb0

Commit 438ceeb0 authored 12 years ago by Nyx Linden

Downloads
- Patches
- Plain Diff

BUILDFIX: merge cleanup

A couple of merge issues that caused the resulting code to not build.

parent 11fe124a

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/llappearance/llavatarappearance.cpp 0 additions, 10 deletions

indra/llappearance/llavatarappearance.cpp
indra/llappearance/llpolyskeletaldistortion.h 1 addition, 1 deletion

indra/llappearance/llpolyskeletaldistortion.h
indra/llcommon/llfasttimer.cpp 6 additions, 0 deletions

indra/llcommon/llfasttimer.cpp
indra/llcommon/llfasttimer.h 2 additions, 0 deletions

indra/llcommon/llfasttimer.h
indra/newview/llworldmapview.cpp 1 addition, 1 deletion

indra/newview/llworldmapview.cpp

with 10 additions and 12 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