QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge...
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
Showing
- indra/CMakeLists.txt 2 additions, 0 deletionsindra/CMakeLists.txt
- indra/cmake/CMakeLists.txt 1 addition, 0 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/FindMT.cmake 15 additions, 0 deletionsindra/cmake/FindMT.cmake
- indra/develop.py 13 additions, 7 deletionsindra/develop.py
- indra/llui/llbutton.cpp 1 addition, 0 deletionsindra/llui/llbutton.cpp
- indra/llui/llui.cpp 29 additions, 7 deletionsindra/llui/llui.cpp
- indra/llui/llui.h 9 additions, 10 deletionsindra/llui/llui.h
- indra/llui/lluictrlfactory.cpp 1 addition, 9 deletionsindra/llui/lluictrlfactory.cpp
- indra/newview/app_settings/settings.xml 14 additions, 3 deletionsindra/newview/app_settings/settings.xml
- indra/newview/installers/windows/installer_template.nsi 26 additions, 11 deletionsindra/newview/installers/windows/installer_template.nsi
- indra/newview/installers/windows/lang_es.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_es.nsi
- indra/newview/installers/windows/lang_fr.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_fr.nsi
- indra/newview/installers/windows/lang_it.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_it.nsi
- indra/newview/installers/windows/lang_nl.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_nl.nsi
- indra/newview/installers/windows/lang_pt-br.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_pt-br.nsi
- indra/newview/installers/windows/lang_zh.nsi 0 additions, 0 deletionsindra/newview/installers/windows/lang_zh.nsi
- indra/newview/llagentlanguage.cpp 5 additions, 4 deletionsindra/newview/llagentlanguage.cpp
- indra/newview/llagentlanguage.h 1 addition, 1 deletionindra/newview/llagentlanguage.h
- indra/newview/llappviewer.cpp 5 additions, 1 deletionindra/newview/llappviewer.cpp
- indra/newview/llfloaterhud.cpp 1 addition, 6 deletionsindra/newview/llfloaterhud.cpp
Loading
Please register or sign in to comment