merge changes for storm-659
Showing
- .hgtags 9 additions, 0 deletions.hgtags
- BuildParams 15 additions, 56 deletionsBuildParams
- doc/contributions.txt 8 additions, 1 deletiondoc/contributions.txt
- indra/cmake/FindLLQtWebkit.cmake 2 additions, 2 deletionsindra/cmake/FindLLQtWebkit.cmake
- indra/linux_updater/linux_updater.cpp 8 additions, 1 deletionindra/linux_updater/linux_updater.cpp
- indra/llcommon/llprocesslauncher.cpp 22 additions, 2 deletionsindra/llcommon/llprocesslauncher.cpp
- indra/llcommon/llversionviewer.h 2 additions, 2 deletionsindra/llcommon/llversionviewer.h
- indra/llmath/v3math.h 13 additions, 0 deletionsindra/llmath/v3math.h
- indra/llplugin/llpluginprocessparent.cpp 1 addition, 0 deletionsindra/llplugin/llpluginprocessparent.cpp
- indra/llprimitive/lltextureentry.cpp 4 additions, 18 deletionsindra/llprimitive/lltextureentry.cpp
- indra/llui/lldockcontrol.cpp 1 addition, 1 deletionindra/llui/lldockcontrol.cpp
- indra/llui/llfloater.cpp 13 additions, 4 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 3 additions, 2 deletionsindra/llui/llfloater.h
- indra/llui/llnotifications.cpp 40 additions, 29 deletionsindra/llui/llnotifications.cpp
- indra/llui/llnotifications.h 5 additions, 6 deletionsindra/llui/llnotifications.h
- indra/llui/llradiogroup.cpp 1 addition, 1 deletionindra/llui/llradiogroup.cpp
- indra/llui/lluictrlfactory.cpp 22 additions, 2 deletionsindra/llui/lluictrlfactory.cpp
- indra/llui/llview.cpp 3 additions, 3 deletionsindra/llui/llview.cpp
- indra/llui/llview.h 2 additions, 2 deletionsindra/llui/llview.h
- indra/llvfs/lldir.cpp 5 additions, 1 deletionindra/llvfs/lldir.cpp
Loading
Please register or sign in to comment