-
- Downloads
svn merge -r 88991:89027...
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Showing
- indra/llinventory/llparcel.h 3 additions, 3 deletionsindra/llinventory/llparcel.h
- indra/llmath/llmath.h 3 additions, 0 deletionsindra/llmath/llmath.h
- indra/llmath/llvolumemgr.cpp 2 additions, 2 deletionsindra/llmath/llvolumemgr.cpp
- indra/llmath/llvolumemgr.h 1 addition, 1 deletionindra/llmath/llvolumemgr.h
- indra/llmath/v3dmath.h 41 additions, 5 deletionsindra/llmath/v3dmath.h
- indra/newview/app_settings/settings.xml 11 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagent.h 1 addition, 1 deletionindra/newview/llagent.h
- indra/newview/llvosky.h 1 addition, 1 deletionindra/newview/llvosky.h
- indra/newview/llworld.cpp 3 additions, 3 deletionsindra/newview/llworld.cpp
- indra/newview/pipeline.cpp 5 additions, 5 deletionsindra/newview/pipeline.cpp
Loading
Please register or sign in to comment