EFFECTIVE MERGE: svn merge -r 70833:71458...
EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
Showing
- indra/llcommon/llapp.cpp 34 additions, 0 deletionsindra/llcommon/llapp.cpp
- indra/llcommon/llkeythrottle.h 205 additions, 0 deletionsindra/llcommon/llkeythrottle.h
- indra/llcommon/llsd.h 1 addition, 0 deletionsindra/llcommon/llsd.h
- indra/llcommon/llsdserialize.cpp 5 additions, 0 deletionsindra/llcommon/llsdserialize.cpp
- indra/llui/llfloater.cpp 2 additions, 4 deletionsindra/llui/llfloater.cpp
- indra/llui/lllineeditor.cpp 2 additions, 8 deletionsindra/llui/lllineeditor.cpp
- indra/llui/lllineeditor.h 0 additions, 2 deletionsindra/llui/lllineeditor.h
- indra/llui/llscrolllistctrl.cpp 15 additions, 4 deletionsindra/llui/llscrolllistctrl.cpp
- indra/llui/llscrolllistctrl.h 1 addition, 0 deletionsindra/llui/llscrolllistctrl.h
- indra/llui/lltexteditor.cpp 2 additions, 8 deletionsindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 0 additions, 2 deletionsindra/llui/lltexteditor.h
- indra/llwindow/llwindowwin32.cpp 23 additions, 4 deletionsindra/llwindow/llwindowwin32.cpp
- indra/llwindow/llwindowwin32.h 1 addition, 0 deletionsindra/llwindow/llwindowwin32.h
- indra/newview/llagent.cpp 15 additions, 0 deletionsindra/newview/llagent.cpp
- indra/newview/llagent.h 2 additions, 0 deletionsindra/newview/llagent.h
- indra/newview/llfloaterfriends.cpp 29 additions, 5 deletionsindra/newview/llfloaterfriends.cpp
- indra/newview/llstartup.cpp 3 additions, 3 deletionsindra/newview/llstartup.cpp
- indra/newview/lltexturefetch.cpp 13 additions, 3 deletionsindra/newview/lltexturefetch.cpp
- indra/newview/lltoolmgr.cpp 5 additions, 0 deletionsindra/newview/lltoolmgr.cpp
- indra/newview/lltoolmgr.h 2 additions, 0 deletionsindra/newview/lltoolmgr.h
Loading
Please register or sign in to comment