summaryrefslogtreecommitdiff
path: root/indra/newview/Info-SecondLife.plist
AgeCommit message (Collapse)Author
2007-11-22svn merge -r74202:74317 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release
2007-11-21svn merge -r 73148:74186 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
2007-11-08svn merge -r 72877:73187 ↵Steven Bennetts
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release Backport patches and translations from RC branch
2007-11-01svn merge -r 71509:72877 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release Backport patches and translations from RC branch
2007-10-02svn merge -r 70080:70711 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer Pick up last minute patches to the viewer from 1.18.3 final release. * Final release notes and version numbers * SL-55123 Mac app icon missing from open source tarball (missed from previous merge?) * SL-55121 Mac mouse cursors missing from open source tarball (missed from previous merge?) (I believe the previous merge in this series, r70180, only committed changes inside indra. I've scrubbed the history of that range and don't see any other missing files other than the two assemblies/ patches noted above)
2007-09-20svn merge -r 69597:70080 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. * SL-55085 Login hangs if optional update is declined. * SL-55123 Mac app icon missing from open source tarball * SL-55121 Mac mouse cursors missing from open source tarball * SL-54978 Remove duplicate code that snuck in during a patch merge * SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update * Release notes/version numbers
2007-09-13svn merge -r 68690:69597 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
2007-09-13Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 ↵Aaron Brashears
into release. had to blow away the libraries directory to clear up svn evil.
2007-08-28svn merge -r 68474:68690 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
2007-08-14* Update versions (client + server) to 1.18.2.0Josh Bell
* Tweak simulator_version script to slam all regions to the new version we're deploying
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-07-27merge -r 66456:66594 Branch_1-18-1 -> releaseSteven Bennetts
Includes voice-server-changes (0:66493)
2007-07-11svn merge -r 65078:65118 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release Sync up last minute patches that went into 1.18.
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
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 ↵Aaron Brashears
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
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
into release
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-02-02svn merge -r 57502:57551 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 (skips 57565, a merge from release. being picky.) Pick up fixes for: * Offer Teleport in profiles * Setting 'none' group * agni_check_parcel_auctions exception (pushed live already)
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 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1 Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.
2007-01-02Print done when done.James Cook