summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Expand)Author
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-03-10QAR-345 merge windlight scriptglow3 into releaseBrad Kittenbrink
2008-03-04svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-09-13svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
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 i...Brad Kittenbrink
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-28Added highlighting for parcel flag object entry constantsKyle Machulis
2007-03-21svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
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 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-01-02Print done when done.James Cook