Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Showing
- indra/cmake/00-Common.cmake 4 additions, 0 deletionsindra/cmake/00-Common.cmake
- indra/llcommon/llapp.cpp 10 additions, 0 deletionsindra/llcommon/llapp.cpp
- indra/newview/CMakeLists.txt 2 additions, 0 deletionsindra/newview/CMakeLists.txt
- indra/newview/app_settings/settings.xml 2 additions, 2 deletionsindra/newview/app_settings/settings.xml
- indra/newview/featuretable.txt 2 additions, 0 deletionsindra/newview/featuretable.txt
- indra/newview/featuretable_linux.txt 1 addition, 0 deletionsindra/newview/featuretable_linux.txt
- indra/newview/featuretable_mac.txt 1 addition, 0 deletionsindra/newview/featuretable_mac.txt
- indra/newview/featuretable_solaris.txt 2 additions, 0 deletionsindra/newview/featuretable_solaris.txt
- indra/newview/llappviewer.cpp 23 additions, 25 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewerwin32.cpp 8 additions, 0 deletionsindra/newview/llappviewerwin32.cpp
- indra/newview/llwindebug.cpp 188 additions, 0 deletionsindra/newview/llwindebug.cpp
- indra/newview/llwindebug.h 49 additions, 0 deletionsindra/newview/llwindebug.h
- install.xml 2 additions, 2 deletionsinstall.xml
Loading
Please register or sign in to comment