-
- Downloads
svn merge -r 90938:92097...
svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
Showing
- indra/llcommon/llsdutil.cpp 3 additions, 2 deletionsindra/llcommon/llsdutil.cpp
- indra/llcommon/llsdutil.h 3 additions, 1 deletionindra/llcommon/llsdutil.h
- indra/llcommon/lluuid.cpp 1 addition, 1 deletionindra/llcommon/lluuid.cpp
- indra/llcommon/roles_constants.h 10 additions, 0 deletionsindra/llcommon/roles_constants.h
- indra/llinventory/llparcel.cpp 4 additions, 2 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 2 additions, 2 deletionsindra/llinventory/llparcel.h
- indra/llui/lllineeditor.cpp 20 additions, 2 deletionsindra/llui/lllineeditor.cpp
- indra/newview/llimpanel.cpp 1 addition, 1 deletionindra/newview/llimpanel.cpp
- indra/newview/llpanellandmedia.cpp 2 additions, 2 deletionsindra/newview/llpanellandmedia.cpp
- indra/newview/llstatusbar.cpp 1 addition, 1 deletionindra/newview/llstatusbar.cpp
- indra/newview/llvoiceclient.cpp 9 additions, 6 deletionsindra/newview/llvoiceclient.cpp
Loading
Please register or sign in to comment