svn merge -r59459:59476...
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
Showing
- indra/llaudio/llaudiodecodemgr.cpp 1 addition, 1 deletionindra/llaudio/llaudiodecodemgr.cpp
- indra/llcharacter/llbvhloader.cpp 1 addition, 1 deletionindra/llcharacter/llbvhloader.cpp
- indra/llcharacter/llkeyframemotion.cpp 2 additions, 2 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcharacter/llkeyframemotionparam.cpp 1 addition, 1 deletionindra/llcharacter/llkeyframemotionparam.cpp
- indra/llcharacter/llmultigesture.cpp 1 addition, 1 deletionindra/llcharacter/llmultigesture.cpp
- indra/llcommon/llpreprocessor.h 3 additions, 3 deletionsindra/llcommon/llpreprocessor.h
- indra/llcommon/llprocessor.cpp 11 additions, 11 deletionsindra/llcommon/llprocessor.cpp
- indra/llcommon/llstring.cpp 27 additions, 0 deletionsindra/llcommon/llstring.cpp
- indra/llcommon/llstring.h 4 additions, 0 deletionsindra/llcommon/llstring.h
- indra/llcommon/llsys.cpp 2 additions, 2 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/lluuidhashmap.h 9 additions, 1 deletionindra/llcommon/lluuidhashmap.h
- indra/llinventory/llinventory.cpp 1 addition, 1 deletionindra/llinventory/llinventory.cpp
- indra/llinventory/llpermissions.cpp 5 additions, 5 deletionsindra/llinventory/llpermissions.cpp
- indra/llmath/llvolumemgr.cpp 1 addition, 1 deletionindra/llmath/llvolumemgr.cpp
- indra/llmessage/llassetstorage.cpp 1 addition, 1 deletionindra/llmessage/llassetstorage.cpp
- indra/llmessage/lldatapacker.cpp 132 additions, 88 deletionsindra/llmessage/lldatapacker.cpp
- indra/llmessage/llhost.cpp 2 additions, 2 deletionsindra/llmessage/llhost.cpp
- indra/llmessage/llhttpassetstorage.cpp 3 additions, 3 deletionsindra/llmessage/llhttpassetstorage.cpp
- indra/llmessage/llinstantmessage.cpp 15 additions, 2 deletionsindra/llmessage/llinstantmessage.cpp
- indra/llmessage/llxfer_file.cpp 1 addition, 1 deletionindra/llmessage/llxfer_file.cpp
Loading
Please register or sign in to comment