summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
AgeCommit message (Expand)Author
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837...Mark Palange
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-11-09EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-10-02svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-...Tess Chu
2007-09-28EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/lin...Don Kjer
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-07-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ...Richard Nelson
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-01-10svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn....Jon Wolk
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 10:21:41 +0000