Skip to content
Snippets Groups Projects
  • Eric Tulla's avatar
    939a5065
    Merging in file-move-merge ( QAR-649 ) · 939a5065
    Eric Tulla authored
    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
    939a5065
    History
    Merging in file-move-merge ( QAR-649 )
    Eric Tulla authored
    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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.