EFFECTIVE MERGE: svn merge -r 66133:68118...
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
Showing
- doc/contributions.txt 211 additions, 46 deletionsdoc/contributions.txt
- indra/llcharacter/llkeyframemotion.cpp 13 additions, 14 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcharacter/llkeyframemotion.h 10 additions, 6 deletionsindra/llcharacter/llkeyframemotion.h
- indra/llcharacter/llmultigesture.cpp 1 addition, 1 deletionindra/llcharacter/llmultigesture.cpp
- indra/llcommon/indra_constants.h 1 addition, 0 deletionsindra/llcommon/indra_constants.h
- indra/llcommon/linden_common.h 1 addition, 0 deletionsindra/llcommon/linden_common.h
- indra/llcommon/llevent.cpp 1 addition, 0 deletionsindra/llcommon/llevent.cpp
- indra/llcommon/llextendedstatus.h 49 additions, 0 deletionsindra/llcommon/llextendedstatus.h
- indra/llcommon/lllivefile.cpp 5 additions, 2 deletionsindra/llcommon/lllivefile.cpp
- indra/llcommon/llmetrics.cpp 1 addition, 1 deletionindra/llcommon/llmetrics.cpp
- indra/llcommon/llsys.cpp 61 additions, 20 deletionsindra/llcommon/llsys.cpp
- indra/llcommon/llsys.h 22 additions, 4 deletionsindra/llcommon/llsys.h
- indra/llcommon/llthread.h 1 addition, 1 deletionindra/llcommon/llthread.h
- indra/llcommon/lltimer.cpp 15 additions, 1 deletionindra/llcommon/lltimer.cpp
- indra/llcommon/lltimer.h 3 additions, 2 deletionsindra/llcommon/lltimer.h
- indra/llimage/llimage.cpp 7 additions, 34 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 1 addition, 1 deletionindra/llimage/llimage.h
- indra/llimage/llimagej2c.cpp 9 additions, 7 deletionsindra/llimage/llimagej2c.cpp
- indra/llimage/llimagej2c.h 3 additions, 1 deletionindra/llimage/llimagej2c.h
- indra/llimagej2coj/llimagej2coj.cpp 1 addition, 1 deletionindra/llimagej2coj/llimagej2coj.cpp
Loading
Please register or sign in to comment