EFFECTIVE MERGE: svn merge -r 71520:73420 ...
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
Showing
- doc/contributions.txt 7 additions, 0 deletionsdoc/contributions.txt
- indra/lib/python/indra/util/llmanifest.py 1 addition, 0 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/llcommon/llstring.cpp 78 additions, 0 deletionsindra/llcommon/llstring.cpp
- indra/llcommon/llstring.h 9 additions, 0 deletionsindra/llcommon/llstring.h
- indra/llmath/llvolume.cpp 4 additions, 4 deletionsindra/llmath/llvolume.cpp
- indra/llmessage/lltransfermanager.cpp 48 additions, 33 deletionsindra/llmessage/lltransfermanager.cpp
- indra/llprimitive/llprimitive.cpp 126 additions, 0 deletionsindra/llprimitive/llprimitive.cpp
- indra/llprimitive/llprimitive.h 12 additions, 0 deletionsindra/llprimitive/llprimitive.h
- indra/llui/lllineeditor.cpp 315 additions, 32 deletionsindra/llui/lllineeditor.cpp
- indra/llui/lllineeditor.h 28 additions, 8 deletionsindra/llui/lllineeditor.h
- indra/llui/llmenugl.cpp 2 additions, 2 deletionsindra/llui/llmenugl.cpp
- indra/llui/lltextbox.cpp 1 addition, 1 deletionindra/llui/lltextbox.cpp
- indra/llui/lltexteditor.cpp 406 additions, 31 deletionsindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 31 additions, 7 deletionsindra/llui/lltexteditor.h
- indra/llui/llui.cpp 28 additions, 0 deletionsindra/llui/llui.cpp
- indra/llui/llui.h 4 additions, 0 deletionsindra/llui/llui.h
- indra/llwindow/llpreeditor.h 81 additions, 0 deletionsindra/llwindow/llpreeditor.h
- indra/llwindow/llwindow.h 5 additions, 1 deletionindra/llwindow/llwindow.h
- indra/llwindow/llwindowmacosx.cpp 376 additions, 6 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowmacosx.h 5 additions, 2 deletionsindra/llwindow/llwindowmacosx.h
Loading
Please register or sign in to comment