Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
No related branches found
No related tags found
Showing
- .hgtags 19 additions, 0 deletions.hgtags
- BuildParams 1 addition, 0 deletionsBuildParams
- autobuild.xml 797 additions, 136 deletionsautobuild.xml
- doc/contributions.txt 18 additions, 1 deletiondoc/contributions.txt
- indra/cmake/GoogleMock.cmake 3 additions, 2 deletionsindra/cmake/GoogleMock.cmake
- indra/cmake/LLAddBuildTest.cmake 0 additions, 5 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/llcharacter/llanimationstates.cpp 139 additions, 139 deletionsindra/llcharacter/llanimationstates.cpp
- indra/llcommon/llavatarconstants.h 4 additions, 4 deletionsindra/llcommon/llavatarconstants.h
- indra/llcommon/lllslconstants.h 1 addition, 1 deletionindra/llcommon/lllslconstants.h
- indra/llcommon/llmemory.cpp 176 additions, 2 deletionsindra/llcommon/llmemory.cpp
- indra/llcommon/llmemory.h 46 additions, 1 deletionindra/llcommon/llmemory.h
- indra/llcommon/llmemtype.cpp 1 addition, 0 deletionsindra/llcommon/llmemtype.cpp
- indra/llcommon/llmetricperformancetester.h 1 addition, 1 deletionindra/llcommon/llmetricperformancetester.h
- indra/llcommon/llversionviewer.h 1 addition, 1 deletionindra/llcommon/llversionviewer.h
- indra/llimage/llimage.cpp 9 additions, 9 deletionsindra/llimage/llimage.cpp
- indra/llimage/llimage.h 2 additions, 2 deletionsindra/llimage/llimage.h
- indra/llimage/llimageworker.cpp 6 additions, 0 deletionsindra/llimage/llimageworker.cpp
- indra/llimage/llimageworker.h 2 additions, 0 deletionsindra/llimage/llimageworker.h
- indra/llmath/llcamera.cpp 1 addition, 0 deletionsindra/llmath/llcamera.cpp
- indra/llmath/llcamera.h 0 additions, 9 deletionsindra/llmath/llcamera.h
Loading
Please register or sign in to comment