summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-10-01svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Christian Goetze
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-09-23merge -r97452:97484 svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-re...Dave Kaprielian
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-17svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventor...Kartic Krishnamurthy
2008-09-15Fix for VC7 DEBUG build failureSteven Bennetts
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-09-05svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-serve...Andrew Meadows
2008-09-02Don't link llcommon against iconv yet.Bryan O'Sullivan
2008-09-02QAR-842 / Port Mac build borkage fix to releaseBryan O'Sullivan
2008-08-29Use target_link_libraries for llcommonBryan O'Sullivan
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
2008-08-25Fix gcc4 with proper Linden-canonical struct definitionsBrian McGroarty
2008-08-21Additional gcc warnings - no code effectBrian McGroarty
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-08-12Revert excess changes from previous commit - I hate it when that happens.Christian Goetze
2008-08-12svn -c 94141 merge svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-mer...Christian Goetze
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-08-07svn merge -r 93444:93885 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-28svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-25svn merge -r 92383:92992 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-07-17svn merge -r 91176:92383 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-15svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-...Jon Wolk
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
2008-06-26Bumping up version in anticipation of freezing for the next server release.Josh Bell
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-25svn merge -r90394:90492 svn/branches/havok4/qar-689 --> releaseDave Simmons
2008-06-21svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-6...Kyle Ambroff
2008-06-06svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --...Josh Bell
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-13svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escro...Ryan Williams
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-05-06merge release-QAR-511 Viewer 1.20 RC 5Steven Bennetts
2008-05-02svn merge -r 86069:86558 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-25QAR-404 - merge - svn merge -r 85795:HEAD svn+ssh://svn.lindenlab.com/svn/lin...Brian McGroarty