svn merge -r106715:HEAD...
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Showing
- indra/llcommon/lldate.cpp 16 additions, 1 deletionindra/llcommon/lldate.cpp
- indra/llcommon/lldate.h 28 additions, 1 deletionindra/llcommon/lldate.h
- indra/llcommon/llmemory.h 32 additions, 27 deletionsindra/llcommon/llmemory.h
- indra/llcommon/llsd.cpp 31 additions, 9 deletionsindra/llcommon/llsd.cpp
- indra/llcommon/llsd.h 2 additions, 2 deletionsindra/llcommon/llsd.h
- indra/llcommon/lltimer.cpp 8 additions, 0 deletionsindra/llcommon/lltimer.cpp
- indra/llcommon/lltimer.h 2 additions, 0 deletionsindra/llcommon/lltimer.h
- indra/llcommon/lluuid.cpp 15 additions, 0 deletionsindra/llcommon/lluuid.cpp
- indra/llcommon/lluuid.h 4 additions, 1 deletionindra/llcommon/lluuid.h
- indra/llinventory/lleconomy.h 2 additions, 0 deletionsindra/llinventory/lleconomy.h
- indra/llmath/llmath.h 24 additions, 0 deletionsindra/llmath/llmath.h
- indra/llmath/llrect.h 5 additions, 0 deletionsindra/llmath/llrect.h
- indra/llrender/llgl.cpp 1 addition, 4 deletionsindra/llrender/llgl.cpp
- indra/llui/CMakeLists.txt 4 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/llcombobox.cpp 25 additions, 7 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 1 addition, 0 deletionsindra/llui/llcombobox.h
- indra/llui/llfloater.cpp 5 additions, 0 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 22 additions, 2 deletionsindra/llui/llfloater.h
- indra/llui/llfunctorregistry.cpp 37 additions, 0 deletionsindra/llui/llfunctorregistry.cpp
- indra/llui/llfunctorregistry.h 145 additions, 0 deletionsindra/llui/llfunctorregistry.h
Loading
Please register or sign in to comment