svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Showing
- doc/contributions.txt 7 additions, 1 deletiondoc/contributions.txt
- indra/llcommon/CMakeLists.txt 2 additions, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/llchat.h 3 additions, 1 deletionindra/llcommon/llchat.h
- indra/llcommon/llcursortypes.cpp 89 additions, 0 deletionsindra/llcommon/llcursortypes.cpp
- indra/llcommon/llcursortypes.h 81 additions, 0 deletionsindra/llcommon/llcursortypes.h
- indra/llmath/llcamera.cpp 27 additions, 30 deletionsindra/llmath/llcamera.cpp
- indra/llmath/llcamera.h 15 additions, 7 deletionsindra/llmath/llcamera.h
- indra/llmath/lloctree.h 2 additions, 2 deletionsindra/llmath/lloctree.h
- indra/llmessage/llnamevalue.cpp 0 additions, 1 deletionindra/llmessage/llnamevalue.cpp
- indra/llrender/llcubemap.cpp 0 additions, 1 deletionindra/llrender/llcubemap.cpp
- indra/llui/CMakeLists.txt 2 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/llbutton.cpp 1 addition, 7 deletionsindra/llui/llbutton.cpp
- indra/llui/llfloater.h 1 addition, 1 deletionindra/llui/llfloater.h
- indra/llui/llpanel.cpp 2 additions, 2 deletionsindra/llui/llpanel.cpp
- indra/llui/llpanel.h 1 addition, 1 deletionindra/llui/llpanel.h
- indra/llui/llprogressbar.cpp 180 additions, 0 deletionsindra/llui/llprogressbar.cpp
- indra/llui/llprogressbar.h 75 additions, 0 deletionsindra/llui/llprogressbar.h
- indra/llui/llscrollbar.cpp 1 addition, 6 deletionsindra/llui/llscrollbar.cpp
- indra/llui/lltextbox.cpp 34 additions, 76 deletionsindra/llui/lltextbox.cpp
- indra/llui/lltextbox.h 7 additions, 3 deletionsindra/llui/lltextbox.h
Loading
Please register or sign in to comment