QAR-211: Logical merge of:
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573 svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods plus addition to MANIFEST for revoke-gods Actual merge: svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a * QAR-177 Linux Voice Support Merge BuildMe * QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions) * QAR-194 simcrash-economy-fix * QAR-201 Revoke gods added to deploy
Showing
- indra/llui/llcombobox.cpp 27 additions, 23 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 3 additions, 3 deletionsindra/llui/llcombobox.h
- indra/llui/llctrlselectioninterface.h 1 addition, 1 deletionindra/llui/llctrlselectioninterface.h
- indra/llui/llradiogroup.cpp 1 addition, 1 deletionindra/llui/llradiogroup.cpp
- indra/llui/llradiogroup.h 1 addition, 1 deletionindra/llui/llradiogroup.h
- indra/llui/llscrolllistctrl.cpp 191 additions, 170 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/llscrolllistctrl.h 48 additions, 46 deletionsindra/llui/llscrolllistctrl.h
- indra/newview/linux_tools/client-readme-voice.txt 91 additions, 0 deletionsindra/newview/linux_tools/client-readme-voice.txt
- indra/newview/linux_tools/client-readme.txt 12 additions, 9 deletionsindra/newview/linux_tools/client-readme.txt
- indra/newview/linux_tools/wrapper.sh 0 additions, 2 deletionsindra/newview/linux_tools/wrapper.sh
- indra/newview/llchatbar.cpp 1 addition, 1 deletionindra/newview/llchatbar.cpp
- indra/newview/llcompilequeue.cpp 6 additions, 6 deletionsindra/newview/llcompilequeue.cpp
- indra/newview/llfloateravatarpicker.cpp 2 additions, 2 deletionsindra/newview/llfloateravatarpicker.cpp
- indra/newview/llfloaterland.cpp 12 additions, 87 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterland.h 0 additions, 11 deletionsindra/newview/llfloaterland.h
- indra/newview/llfloaterlandholdings.cpp 1 addition, 1 deletionindra/newview/llfloaterlandholdings.cpp
- indra/newview/llfloaterreporter.cpp 1 addition, 1 deletionindra/newview/llfloaterreporter.cpp
- indra/newview/llfloatersnapshot.cpp 1 addition, 1 deletionindra/newview/llfloatersnapshot.cpp
- indra/newview/llfloatertelehub.cpp 1 addition, 1 deletionindra/newview/llfloatertelehub.cpp
- indra/newview/llfloaterworldmap.cpp 4 additions, 4 deletionsindra/newview/llfloaterworldmap.cpp
Loading
Please register or sign in to comment