svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088...
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
Showing
- etc/message.xml 199 additions, 31 deletionsetc/message.xml
- indra/lib/python/indra/__init__.py 5 additions, 6 deletionsindra/lib/python/indra/__init__.py
- indra/llcommon/lldarray.h 16 additions, 3 deletionsindra/llcommon/lldarray.h
- indra/llcommon/llstreamtools.h 2 additions, 0 deletionsindra/llcommon/llstreamtools.h
- indra/llcommon/llstring.h 0 additions, 4 deletionsindra/llcommon/llstring.h
- indra/llmath/llv4math.h 9 additions, 1 deletionindra/llmath/llv4math.h
- indra/llmessage/llcircuit.h 5 additions, 1 deletionindra/llmessage/llcircuit.h
- indra/llmessage/llhost.cpp 6 additions, 6 deletionsindra/llmessage/llhost.cpp
- indra/llmessage/llhost.h 5 additions, 1 deletionindra/llmessage/llhost.h
- indra/llmessage/llhttpclient.cpp 0 additions, 3 deletionsindra/llmessage/llhttpclient.cpp
- indra/llmessage/llhttpsender.cpp 9 additions, 2 deletionsindra/llmessage/llhttpsender.cpp
- indra/llmessage/llhttpsender.h 3 additions, 0 deletionsindra/llmessage/llhttpsender.h
- indra/llmessage/lliosocket.cpp 7 additions, 7 deletionsindra/llmessage/lliosocket.cpp
- indra/llmessage/llmessagebuilder.h 33 additions, 20 deletionsindra/llmessage/llmessagebuilder.h
- indra/llmessage/llmessageconfig.cpp 94 additions, 71 deletionsindra/llmessage/llmessageconfig.cpp
- indra/llmessage/llmessageconfig.h 11 additions, 8 deletionsindra/llmessage/llmessageconfig.h
- indra/llmessage/llmessagereader.cpp 8 additions, 0 deletionsindra/llmessage/llmessagereader.cpp
- indra/llmessage/llmessagereader.h 9 additions, 0 deletionsindra/llmessage/llmessagereader.h
- indra/llmessage/llmessagetemplate.cpp 10 additions, 2 deletionsindra/llmessage/llmessagetemplate.cpp
- indra/llmessage/llmessagetemplate.h 51 additions, 12 deletionsindra/llmessage/llmessagetemplate.h
Loading
Please register or sign in to comment