summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/se...Robert Knop
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-26Now that server 1.26 has frozen and branched away, bump the serverRobert Knop
2009-01-19Merging from the server/server-1.25 branchRobert Knop
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-08setting viewer to report 1.23.0, because code in trunk is well beyond 1.22 no...Ramzi Ramey
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-06Fix for etch build. Q and I both fixed LLDate by adding an operator!=() but ...Andrew Meadows
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
2008-12-18QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/bra...Christian Goetze
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-12-01svn merge -r103586:104391 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2008-11-26Updating version to 1.25.0. Current in 1.25 branch is 1.25.2, but thereRobert Knop
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC...Mark Palange
2008-10-20bump build number to 100,000. w00t.Kyle Ambroff
2008-10-10svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andre...Andrew Meadows
2008-10-09QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim...Don Kjer
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 10:26:34 +0000