| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2009-09-22 | Merging render-pipeline-6-qa-2 into viewer-2 | David Parks | |
| Self reviewed. | |||
| 2009-02-18 | Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵ | Brad Kittenbrink | |
| (maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | |||
| 2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
| svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
| 2008-06-30 | Merging in file-move-merge ( QAR-649 ) | Eric Tulla | |
| 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 | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |