summaryrefslogtreecommitdiff
path: root/indra/newview/llviewernetwork.h
AgeCommit message (Expand)Author
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
2009-07-08DEV-34822 - merge with 1.23Roxanne Skelly
2010-02-01Merge giab-viewer-trunk 2497, general merge of moreRoxie Linden
2009-05-11svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...Nat Goodspeed
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-03DEV-21940 - Add five new dev grids to the viewer login panel. bharati, chandr...Kyle Ambroff
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-01-18svn merge -r 77823:77835 svn+ssh://svn.lindenlab.com/svn/linden/branches/logi...Josh Bell
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook