svn merge -r108236:108243 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Still merging from server-1.25... one day I will catch up! No conflicts
Showing
- indra/llmessage/llpacketbuffer.cpp 2 additions, 1 deletionindra/llmessage/llpacketbuffer.cpp
- indra/llmessage/llpacketbuffer.h 5 additions, 3 deletionsindra/llmessage/llpacketbuffer.h
- indra/llmessage/llpacketring.cpp 2 additions, 0 deletionsindra/llmessage/llpacketring.cpp
- indra/llmessage/llpacketring.h 7 additions, 0 deletionsindra/llmessage/llpacketring.h
- indra/llmessage/message.cpp 22 additions, 0 deletionsindra/llmessage/message.cpp
- indra/llmessage/message.h 14 additions, 0 deletionsindra/llmessage/message.h
- indra/llmessage/net.cpp 83 additions, 1 deletionindra/llmessage/net.cpp
- indra/llmessage/net.h 2 additions, 0 deletionsindra/llmessage/net.h
Loading
Please register or sign in to comment