summaryrefslogtreecommitdiff
path: root/indra/newview/English.lproj
AgeCommit message (Collapse)Author
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-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
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