summaryrefslogtreecommitdiff
path: root/indra/newview/llfasttimerview.cpp
AgeCommit message (Expand)Author
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge -r 78989:80279 Branch_1-19-0-Viewer-> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-07SKIPPED 58849. merge -r 58856:58859 maintenance -> releaseSteven Bennetts
2007-03-03Commented out temp fast timers that got checked in.Steven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-23merge -r 56842:57026 maintenance.Steven Bennetts
2007-01-02Print done when done.James Cook