Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
Showing
- indra/llcommon/llapr.cpp 6 additions, 6 deletionsindra/llcommon/llapr.cpp
- indra/llcommon/llerror.cpp 63 additions, 6 deletionsindra/llcommon/llerror.cpp
- indra/llcommon/llerror.h 56 additions, 26 deletionsindra/llcommon/llerror.h
- indra/llcommon/lltimer.cpp 3 additions, 2 deletionsindra/llcommon/lltimer.cpp
- indra/llcommon/lltimer.h 2 additions, 2 deletionsindra/llcommon/lltimer.h
- indra/llmath/lloctree.h 2 additions, 2 deletionsindra/llmath/lloctree.h
- indra/llmessage/llassetstorage.cpp 1 addition, 1 deletionindra/llmessage/llassetstorage.cpp
- indra/llmessage/llhttpnode.cpp 2 additions, 2 deletionsindra/llmessage/llhttpnode.cpp
- indra/llmessage/llmessageconfig.cpp 11 additions, 11 deletionsindra/llmessage/llmessageconfig.cpp
- indra/llmessage/llxfermanager.cpp 2 additions, 2 deletionsindra/llmessage/llxfermanager.cpp
- indra/llmessage/message.cpp 132 additions, 136 deletionsindra/llmessage/message.cpp
- indra/llmessage/net.cpp 11 additions, 11 deletionsindra/llmessage/net.cpp
- indra/llrender/llfontgl.cpp 2 additions, 2 deletionsindra/llrender/llfontgl.cpp
- indra/llui/llfloater.cpp 16 additions, 4 deletionsindra/llui/llfloater.cpp
- indra/llvfs/lldir.cpp 15 additions, 15 deletionsindra/llvfs/lldir.cpp
- indra/llvfs/llvfs.cpp 23 additions, 22 deletionsindra/llvfs/llvfs.cpp
- indra/llwindow/lldxhardware.cpp 10 additions, 11 deletionsindra/llwindow/lldxhardware.cpp
- indra/llwindow/llwindowmacosx.cpp 31 additions, 31 deletionsindra/llwindow/llwindowmacosx.cpp
- indra/llwindow/llwindowwin32.cpp 61 additions, 64 deletionsindra/llwindow/llwindowwin32.cpp
- indra/llxml/llcontrol.cpp 2 additions, 2 deletionsindra/llxml/llcontrol.cpp
Loading
Please register or sign in to comment