Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
2009-10-03 | Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵ | James Cook | |
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-01-24 | DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to ↵ | James Cook | |
match the wiki [[License Substition]] standard. Commit to release OK by Josh/Jwolk. | |||
2007-12-05 | EFFECTIVE MERGE: svn merge -r 71520:73420 ↵ | Don Kjer | |
svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release |