summaryrefslogtreecommitdiff
path: root/indra/newview/English.lproj
AgeCommit message (Expand)Author
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> v...Steven Bennetts
2009-04-09svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-01-08svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2008-12-05merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunkDave Kaprielian
2008-10-01svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Christian Goetze
2008-09-23merge -r97452:97484 svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-re...Dave Kaprielian
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-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-09svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Dave Kaprielian
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-02-29svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-02-28merge Branch_1-19-0-Viewer -r 80279 : 80947 -> releaseSteven Bennetts
2008-02-19merge -r 78989:80279 Branch_1-19-0-Viewer-> releaseSteven Bennetts
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
2008-01-28svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-01-12svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-01-03svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-m...Steven Bennetts
2007-12-03svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-22svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-View...Christian Goetze
2007-11-21svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-08svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Steven Bennetts
2007-11-01svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-02svn merge -r 70080:70711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-09-20svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-09-13svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-09-13Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 int...Aaron Brashears
2007-08-28svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-08-14* Update versions (client + server) to 1.18.2.0Josh Bell
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-11svn merge -r 65078:65118 svn+ssh://svn.lindenlab.com/svn/linden/branches/rele...Josh Bell
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-07-05Version 1.17.3.0.Lee Montgomery
2007-06-30Backed out revision 64585. Not reviewed.Nathan Savage
2007-06-30Version 1-17-2-64582 based on svn revision 64582.Nathan Savage
2007-06-25Bumping version numbers to 1.17.2.0 for possible Rolling Server deployJosh Bell
2007-06-22Release branded as 1.17.1.0 with release notes.Anthony Foster
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-15Version 1.15.2.0 (serverside only).Lee Montgomery
2007-05-07Version 1.15.1.0.Lee Montgomery
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 23:06:09 +0000