EFFECTIVE MERGE: svn merge -r 69928:70806...
EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
Showing
- indra/llcommon/lldate.cpp 3 additions, 1 deletionindra/llcommon/lldate.cpp
- indra/llmath/llvolume.cpp 41 additions, 30 deletionsindra/llmath/llvolume.cpp
- indra/llprimitive/llprimitive.cpp 1 addition, 0 deletionsindra/llprimitive/llprimitive.cpp
- indra/llprimitive/lltextureentry.h 4 additions, 0 deletionsindra/llprimitive/lltextureentry.h
- indra/llui/lllineeditor.cpp 5 additions, 5 deletionsindra/llui/lllineeditor.cpp
- indra/newview/llchatbar.cpp 2 additions, 2 deletionsindra/newview/llchatbar.cpp
- indra/newview/llfloaterworldmap.cpp 0 additions, 15 deletionsindra/newview/llfloaterworldmap.cpp
- indra/newview/llfolderview.cpp 8 additions, 0 deletionsindra/newview/llfolderview.cpp
- indra/newview/llgroupmgr.cpp 8 additions, 4 deletionsindra/newview/llgroupmgr.cpp
- indra/newview/llinventorybridge.cpp 8 additions, 2 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llpanelgroup.cpp 2 additions, 2 deletionsindra/newview/llpanelgroup.cpp
- indra/newview/llpreviewgesture.cpp 17 additions, 3 deletionsindra/newview/llpreviewgesture.cpp
- indra/newview/llselectmgr.cpp 29 additions, 6 deletionsindra/newview/llselectmgr.cpp
- indra/newview/llselectmgr.h 6 additions, 1 deletionindra/newview/llselectmgr.h
- indra/newview/llstartup.cpp 11 additions, 62 deletionsindra/newview/llstartup.cpp
- indra/newview/lltoolselect.cpp 8 additions, 0 deletionsindra/newview/lltoolselect.cpp
- indra/newview/pipeline.cpp 0 additions, 8 deletionsindra/newview/pipeline.cpp
- indra/newview/pipeline.h 0 additions, 7 deletionsindra/newview/pipeline.h
Loading
Please register or sign in to comment