summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r109009:109164 svn+ssh://svn.lindenlab.com/svn/linden/branches/vie...Mark Palange
2009-02-06QAR-1202 Mergeme for Viewer font in Russian, Ukrainian (for businessAdam Moss
2009-02-03svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewe...Mark Palange
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-12-10always skip fmod shutdown, instead of just for release builds.Adam Moss
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:...James Cook
2008-10-28svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporat...James Cook
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-09-05svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-serve...Andrew Meadows
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23DEV-18283 Remove nonsense mem-checking debug codeBrian McGroarty
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-07-03simple crash fix if someone creates a bad command line. fallout from string c...Aaron Brashears
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --...Josh Bell
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-09QAR-537 Viewer 1.20 RC 6Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 2 (additional changes)Steven Bennetts
2008-04-23QAR-488 Viewer 1.20 RC 2Steven Bennetts
2008-04-17QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMeAdam Moss
2008-04-17QAR-449 Viewer 1.20 RC 1Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-04QAR-427Steven Bennetts
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts