Ansariel c53bc7e74f Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llviewercontrol.cpp # indra/newview/skins/default/xui/en/notifications.xml		2024-12-15 21:44:14 +01:00
..
CMakeLists.txt	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llappdelegate-objc.h	…
llcursortypes.cpp	…
llcursortypes.h	…
lldragdropwin32.cpp	…
lldragdropwin32.h	Clean up Windows build (#2562)	2024-09-13 17:28:48 +03:00
lldxhardware.cpp	…
lldxhardware.h	…
llkeyboard.cpp	…
llkeyboard.h	…
llkeyboardheadless.cpp	…
llkeyboardheadless.h	…
llkeyboardmacosx.cpp	…
llkeyboardmacosx.h	…
llkeyboardsdl.cpp	…
llkeyboardsdl.h	…
llkeyboardsdl2.cpp	…
llkeyboardsdl2.h	…
llkeyboardwin32.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00
llkeyboardwin32.h	…
llmousehandler.cpp	…
llmousehandler.h	…
llopenglview-objc.h	…
llopenglview-objc.mm	…
llpreeditor.h	…
llwindow.cpp	…
llwindow.h	…
llwindowcallbacks.cpp	…
llwindowcallbacks.h	…
llwindowheadless.cpp	…
llwindowheadless.h	…
llwindowmacosx-objc.h	…
llwindowmacosx-objc.mm	…
llwindowmacosx.cpp	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer	2024-12-15 21:44:14 +01:00
llwindowmacosx.h	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer	2024-12-15 21:44:14 +01:00
llwindowmesaheadless.cpp	…
llwindowmesaheadless.h	…
llwindowsdl.cpp	…
llwindowsdl.h	…
llwindowsdl2.cpp	…
llwindowsdl2.h	…
llwindowwin32.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-12-04 15:15:01 +01:00
llwindowwin32.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-13 18:54:12 +02:00