livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llwindow
History
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
..
GL svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
CMakeLists.txt Merging in file-move-merge ( QAR-649 ) 2008-06-30 17:57:00 +00:00
lldxhardware.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldxhardware.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeyboard.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeyboard.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeyboardmacosx.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardmacosx.h 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
llkeyboardsdl.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardsdl.h 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
llkeyboardwin32.cpp svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 2008-03-04 16:59:57 +00:00
llkeyboardwin32.h 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
llmousehandler.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpreeditor.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llwindow.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindow.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowheadless.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowheadless.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowmacosx-objc.h 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
llwindowmacosx-objc.mm QAR-566 maint-viewer-5-merge-2 2008-05-11 20:56:42 +00:00
llwindowmacosx.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowmacosx.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowmesaheadless.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowmesaheadless.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowsdl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowsdl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llwindowwin32.cpp QAR-669 1.20 Viewer RC11 2008-06-27 21:02:01 +00:00
llwindowwin32.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00