Robert Knop
authored
Merging server-1.26 back to trunk. Two conflicts -- llversionserver.hh (kept the trunk version) and in llsimparcelmgr.cpp -- also kept the trunk version. There was some code in 1.26 that included error printing from RDW that says "we should really not be hitting this code", and that code was gone in trunk... so, went ahead and kept the trunk part of that one conflict in that file.
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
Name | Last commit | Last update |
---|---|---|
.. | ||
automated_build_scripts | ||
messages | ||
build_version.py | ||
install.py | ||
setup-path.py | ||
template_verifier.py | ||
update_version_files.py |