Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-07-07 | Merge skinning-14 to viewer-2, including refactoring many floaters to ↵ | James Cook | |
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 | |||
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-02-19 | merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵ | Steven Bennetts | |
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191 | |||
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-06-21 | merge -r62831:64079 branches/maintenance to release | Kelly Washington | |
2007-03-09 | svn merge -r 58902:58986 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | |||
2007-02-17 | merge -r 56779:58057 /branches/selection_management | Richard Nelson | |
2007-02-02 | Result of svn merge -r57264:57370 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | |||
2007-01-17 | merge release@56803 release-candidate@56833 | Steven Bennetts | |