Andrey Kleshchev 069304ca39 Merge branch 'master' (DRTVWR-543) into DRTVWR-559 ... # Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp		2022-06-29 21:23:23 +03:00
..
CMakeLists.txt	…
llappdelegate-objc.h	…
llcursortypes.cpp	…
llcursortypes.h	…
lldragdropwin32.cpp	…
lldragdropwin32.h	…
lldxhardware.cpp	…
lldxhardware.h	…
llkeyboard.cpp	…
llkeyboard.h	…
llkeyboardheadless.cpp	…
llkeyboardheadless.h	…
llkeyboardmacosx.cpp	…
llkeyboardmacosx.h	…
llkeyboardsdl.cpp	…
llkeyboardsdl.h	…
llkeyboardwin32.cpp	…
llkeyboardwin32.h	…
llmousehandler.cpp	…
llmousehandler.h	…
llopenglview-objc.h	…
llopenglview-objc.mm	DRTVWR-546 merge in master v6.5.1	2021-11-16 11:44:55 -07:00
llpreeditor.h	…
llwindow.cpp	SL-16330 Clean up vertical sync handling, add to UI	2021-11-09 17:17:49 +02:00
llwindow.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowcallbacks.cpp	…
llwindowcallbacks.h	…
llwindowheadless.cpp	SL-16330 Clean up vertical sync handling, add to UI	2021-11-09 17:17:49 +02:00
llwindowheadless.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowmacosx-objc.h	…
llwindowmacosx-objc.mm	…
llwindowmacosx.cpp	Merge branch 'master' (DRTVWR-557) into DRTVWR-546	2022-03-01 13:41:42 +02:00
llwindowmacosx.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowmesaheadless.cpp	…
llwindowmesaheadless.h	…
llwindowsdl.cpp	…
llwindowsdl.h	…
llwindowwin32.cpp	Merge branch 'master' (DRTVWR-543) into DRTVWR-559	2022-06-29 21:23:23 +03:00
llwindowwin32.h	Merge branch 'master' (DRTVWR-557) into DRTVWR-546	2022-03-01 13:41:42 +02:00