livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llui
History
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release 
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
 		2008-07-22 20:55:02 +00:00
..
CMakeLists.txt svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
llbutton.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llbutton.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcallbackmap.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcheckboxctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcheckboxctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llclipboard.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llclipboard.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llcombobox.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcombobox.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llctrlselectioninterface.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llctrlselectioninterface.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldraghandle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldraghandle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleditmenuhandler.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
lleditmenuhandler.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloater.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llfloater.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llfocusmgr.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfocusmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lliconctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lliconctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeywords.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeywords.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lllineeditor.cpp svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
lllineeditor.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmenugl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmenugl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmodaldialog.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmodaldialog.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultislider.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultislider.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultisliderctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultisliderctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanel.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpanel.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llradiogroup.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llradiogroup.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizebar.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizebar.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizehandle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizehandle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresmgr.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollbar.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollbar.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollcontainer.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollcontainer.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollingpanellist.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollingpanellist.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrolllistctrl.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llscrolllistctrl.h QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llslider.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llslider.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llsliderctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llsliderctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llspinctrl.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llspinctrl.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llstyle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llstyle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltabcontainer.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltabcontainer.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltextbox.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltextbox.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltexteditor.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
lltexteditor.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llui.cpp QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llui.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lluiconstants.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lluictrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lluictrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lluictrlfactory.cpp QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
lluictrlfactory.h QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
lluifwd.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
lluistring.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lluistring.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llundo.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llundo.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llview.cpp svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release 2008-07-22 20:55:02 +00:00
llview.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewborder.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewborder.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewquery.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewquery.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00