svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
Showing
- indra/cmake/GooglePerfTools.cmake 4 additions, 0 deletionsindra/cmake/GooglePerfTools.cmake
- indra/cmake/LLKDU.cmake 0 additions, 2 deletionsindra/cmake/LLKDU.cmake
- indra/develop.py 18 additions, 11 deletionsindra/develop.py
- indra/lib/python/indra/ipc/mysql_pool.py 7 additions, 16 deletionsindra/lib/python/indra/ipc/mysql_pool.py
- indra/llcommon/llstring.h 0 additions, 7 deletionsindra/llcommon/llstring.h
- indra/llprimitive/lltree_common.h 13 additions, 0 deletionsindra/llprimitive/lltree_common.h
- indra/newview/viewer_manifest.py 2 additions, 2 deletionsindra/newview/viewer_manifest.py
- indra/test/CMakeLists.txt 1 addition, 0 deletionsindra/test/CMakeLists.txt
- install.xml 416 additions, 10 deletionsinstall.xml
- scripts/install.py 18 additions, 1 deletionscripts/install.py
- scripts/template_verifier.py 27 additions, 5 deletionsscripts/template_verifier.py
- scripts/update_version_files.py 13 additions, 2 deletionsscripts/update_version_files.py
Loading
Please register or sign in to comment