svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
Showing
- indra/llcommon/indra_constants.h 1 addition, 1 deletionindra/llcommon/indra_constants.h
- indra/llcommon/llsdserialize.cpp 19 additions, 6 deletionsindra/llcommon/llsdserialize.cpp
- indra/llcommon/llsdserialize.h 39 additions, 2 deletionsindra/llcommon/llsdserialize.h
- indra/llcommon/llsdserialize_xml.cpp 105 additions, 23 deletionsindra/llcommon/llsdserialize_xml.cpp
- indra/llcommon/llstat.cpp 3 additions, 2 deletionsindra/llcommon/llstat.cpp
- indra/llcommon/llstat.h 7 additions, 1 deletionindra/llcommon/llstat.h
- indra/llmath/v3math.cpp 66 additions, 0 deletionsindra/llmath/v3math.cpp
- indra/llmath/v3math.h 1 addition, 0 deletionsindra/llmath/v3math.h
- indra/llmessage/llassetstorage.cpp 65 additions, 1 deletionindra/llmessage/llassetstorage.cpp
- indra/llmessage/llassetstorage.h 14 additions, 1 deletionindra/llmessage/llassetstorage.h
- indra/newview/llviewerregion.cpp 1 addition, 1 deletionindra/newview/llviewerregion.cpp
Loading
Please register or sign in to comment