summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
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-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-06-28Setting some shader svn:eol-style properties to native to prevent conflicts ↵Brad Kittenbrink
in windlight4 branch.
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-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-03-28Added highlighting for parcel flag object entry constantsKyle Machulis
2007-03-21svn merge -r 59178:59364 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-09svn merge -r 56560:56599 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-02Print done when done.James Cook