svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Showing
- doc/contributions.txt 5 additions, 2 deletionsdoc/contributions.txt
- indra/llcharacter/llheadrotmotion.cpp 7 additions, 13 deletionsindra/llcharacter/llheadrotmotion.cpp
- indra/llcharacter/lljointstate.h 1 addition, 1 deletionindra/llcharacter/lljointstate.h
- indra/llcharacter/llmotioncontroller.cpp 13 additions, 8 deletionsindra/llcharacter/llmotioncontroller.cpp
- indra/llcharacter/llmotioncontroller.h 1 addition, 1 deletionindra/llcharacter/llmotioncontroller.h
- indra/llcharacter/llvisualparam.h 2 additions, 2 deletionsindra/llcharacter/llvisualparam.h
- indra/llcommon/llenum.h 1 addition, 1 deletionindra/llcommon/llenum.h
- indra/llcommon/metaclass.cpp 3 additions, 0 deletionsindra/llcommon/metaclass.cpp
- indra/llcommon/metaproperty.cpp 3 additions, 0 deletionsindra/llcommon/metaproperty.cpp
- indra/llcommon/reflective.cpp 2 additions, 0 deletionsindra/llcommon/reflective.cpp
- indra/llinventory/llparcel.h 1 addition, 1 deletionindra/llinventory/llparcel.h
- indra/llinventory/llparcelflags.h 1 addition, 1 deletionindra/llinventory/llparcelflags.h
- indra/llmath/llvolume.h 1 addition, 1 deletionindra/llmath/llvolume.h
- indra/llmath/v4color.h 1 addition, 1 deletionindra/llmath/v4color.h
- indra/llmessage/llteleportflags.h 1 addition, 0 deletionsindra/llmessage/llteleportflags.h
- indra/llmessage/machine.h 2 additions, 2 deletionsindra/llmessage/machine.h
- indra/llmessage/net.cpp 3 additions, 2 deletionsindra/llmessage/net.cpp
- indra/llprimitive/llprimitive.h 3 additions, 3 deletionsindra/llprimitive/llprimitive.h
- indra/llprimitive/lltreeparams.h 1 addition, 1 deletionindra/llprimitive/lltreeparams.h
- indra/llui/llscrolllistctrl.h 2 additions, 2 deletionsindra/llui/llscrolllistctrl.h
Loading
Please register or sign in to comment