summaryrefslogtreecommitdiff
path: root/indra/llrender/llglheaders.h
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-03-09svn merge -r113780:113785Adam Moss
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
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
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla