6 Commits (667ca55bad0108c4bdf8f007b89e1a52fc766aad)

Author	SHA1	Message	Date
Mark Palange	fb793870fe	QAR-1142 merging 1.22 RC0-RC4 changes. ... svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge	2008-12-23 19:39:58 +00:00
Mark Palange	f89f19990c	QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release	2008-11-07 17:51:03 +00:00
Steven Bennetts	da94c0eaa2	QAR-855 Viewer 1.21 RC 2 ... merge viewer_1-21 94770-96059 -> release	2008-09-12 06:27:13 +00:00
Steven Bennetts	80be4c1d2d	QAR-767 Combined maint-render-7 and maint-viewer-9 merge ... merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated	2008-08-12 17:29:50 +00:00
Eric Tulla	939a506569	Merging in file-move-merge ( QAR-649 ) ... Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h	2008-06-30 17:57:00 +00:00
Steven Bennetts	ad33281007	QAR-650 - Viewer RC 9 merge -> release (post cmake) ... merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release	2008-06-06 22:43:38 +00:00