8 Commits (cc2f19ebd084c309be77ff1e4c8ed4b001cbdb36)

Author	SHA1	Message	Date
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +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	941cb9f412	merge release@83343 skinning-1-merge@83714 -> release ... QAR-424	2008-04-01 17:45:04 +00:00
Brad Kittenbrink	6d52efe452	Merge of windlight into release (QAR-286). This includes all changes in ... windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620	2008-02-27 18:58:14 +00:00
Aaron Brashears	5595a99623	Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.	2007-10-04 23:19:43 +00:00
Don Kjer	1c909afe39	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release	2007-05-02 21:24:47 +00:00
Josh Bell	0277259455	svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release	2007-04-11 17:54:18 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00