2 Commits (052d49786a8a19b9b0eb2b150a6412c5fabcdf53)

Author	SHA1	Message	Date
Ansariel	5f1a19af72	Merge remote-tracking branch 'LL/marchcat/x-ws-merge' ... # Conflicts: # autobuild.xml # indra/linux_crash_logger/llcrashloggerlinux.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llcallbacklist.cpp # indra/newview/llimpanel.h	2024-05-01 12:30:57 +02:00
Nicky	99ab6bd049	Add ETW support to get custom trace points eg in xperf traces.	2014-06-04 18:37:19 +02:00