svn merge -r 79730:79944...
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
Showing
- etc/message.xml 12 additions, 1 deletionetc/message.xml
- indra/llcommon/indra_constants.h 4 additions, 0 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/llclickaction.h 2 additions, 0 deletionsindra/llcommon/llclickaction.h
- indra/llcommon/llpreprocessor.h 0 additions, 27 deletionsindra/llcommon/llpreprocessor.h
- indra/llinventory/llparcel.cpp 772 additions, 630 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 22 additions, 0 deletionsindra/llinventory/llparcel.h
- indra/llmessage/llhttpclient.cpp 19 additions, 1 deletionindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpclient.h 9 additions, 2 deletionsindra/llmessage/llhttpclient.h
- indra/llmessage/llurlrequest.cpp 2 additions, 4 deletionsindra/llmessage/llurlrequest.cpp
- indra/llrender/llimagegl.cpp 1 addition, 1 deletionindra/llrender/llimagegl.cpp
- indra/llui/llcombobox.cpp 15 additions, 16 deletionsindra/llui/llcombobox.cpp
- indra/llui/llradiogroup.cpp 3 additions, 1 deletionindra/llui/llradiogroup.cpp
- indra/llui/llscrolllistctrl.cpp 5 additions, 4 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/lluictrl.cpp 10 additions, 8 deletionsindra/llui/lluictrl.cpp
- indra/llui/lluictrl.h 1 addition, 1 deletionindra/llui/lluictrl.h
- indra/llui/lluifwd.h 40 additions, 0 deletionsindra/llui/lluifwd.h
- indra/llwindow/llwindow.h 3 additions, 0 deletionsindra/llwindow/llwindow.h
- indra/llwindow/llwindowmacosx.cpp 9 additions, 0 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowsdl.cpp 22 additions, 10 deletionsindra/llwindow/llwindowsdl.cpp
- indra/llwindow/llwindowwin32.cpp 3 additions, 0 deletionsindra/llwindow/llwindowwin32.cpp
Loading
Please register or sign in to comment