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
..
CMakeLists.txt	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer	2022-09-17 23:12:34 +02:00
media_plugin_example.cpp	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00