Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK ... # Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp		2022-01-10 23:51:52 +02:00
..
base	remove only-partially-successful attempt to put teamcity blocks around targets	2018-09-07 09:13:57 -04:00
cef	Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK	2022-01-10 23:51:52 +02:00
example	SL-3704 Plugin exit issues	2019-07-01 17:28:58 +03:00
gstreamer010	remove only-partially-successful attempt to put teamcity blocks around targets	2018-09-07 09:13:57 -04:00
libvlc	SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat	2021-11-09 02:38:58 +02:00
CMakeLists.txt	Add back the missing pieces and updated code for the example plugin. It was useful during testing SLPlugin changes. Not shipped with release versions of viewer	2017-04-19 15:59:29 -07:00