summaryrefslogtreecommitdiff
path: root/indra/newview/English.lproj
AgeCommit message (Expand)Author
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
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-02-02svn merge -r 57502:57551 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-26merge -r 57082:57190 Branch_1-13-2Steven Bennetts
2007-01-24merge -r 56696:57082 Branch_1-13-2Steven Bennetts
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-08svn merge -r 56262:56561 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-01-02Print done when done.James Cook