summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
AgeCommit message (Collapse)Author
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-03-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-05QAR-1293 - Mergeback of changes made in Viewer 1.22 RC10Mark Palange
svn merge -r112338-112378 svn+ssh://svn/lindenlab.com/svn/linden/branches/viewer/viewer_1-22 to trunk
2009-02-27svn merge -r 113014:113017 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323 Merging in QAR-1323.
2009-02-24QAR-1262 Merging non-voice related Viewer 1.22 RC 9 changes back to trunk.Mark Palange
svn merge -r109446-109676 -r109832-109921 -r109956 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.22
2009-02-06svn merge -r109009:109164 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22 Merge-back of non-voice related viewer 1.22 RC8 changes to trunk. QAR-1242
2009-02-03svn merge -r107016:108767 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-13svn merge -r106055-107012 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 ↵Mark Palange
RC5 secu-fix to 1.21.6 release.
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk (for real)
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 ↵Mark Palange
fixes) merge to trunk
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-07-24DEV-18322 current trunk viewer doesn't startAdam Moss
remove erroneous texture entries which were probably the result of a mismerge. approved by steve & james.
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456