summaryrefslogtreecommitdiff
path: root/etc
AgeCommit message (Expand)Author
2009-08-09svn merge -r128876:129999 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Kyle Ambroff
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-03-24Result of svn merge -r115023:115025 svn+ssh://svn/svn/linden/branches/no_free...Aaron Brashears
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2008-10-01svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Christian Goetze
2008-09-16Banned the AIS related caps so that when the new Server is deployed, AIS code...Kartic Krishnamurthy
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventor...Kartic Krishnamurthy
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-10svn merge -r84490:84497 svn+ssh://svn/svn/linden/branches/DEV-11812-3Leyla Farazha
2008-04-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
2008-03-25svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-21svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-18svn merge -r 82263:82563 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-13svn merge -r 81720:82231 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-06EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/F...Don Kjer
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
2007-11-21svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-02Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://...Leyla Farazha
2007-11-01svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-s...Josh Bell
2007-09-19Passed QA, merging minifriends-3:70006 back to releaseMelinda Green
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-07-27merge -r 66456:66594 Branch_1-18-1 -> releaseSteven Bennetts
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer