summaryrefslogtreecommitdiff
path: root/indra/newview/linux_tools
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-03-07 09:46:02 -0500
committerOz Linden <oz@lindenlab.com>2016-03-07 09:46:02 -0500
commitc7ebeb842010c4a814978f63c464e1546bd6a9be (patch)
treede77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/newview/linux_tools
parent8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff)
parent4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff)
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/linux_tools')
-rw-r--r--[-rwxr-xr-x]indra/newview/linux_tools/client-readme-joystick.txt0
-rw-r--r--[-rwxr-xr-x]indra/newview/linux_tools/client-readme-voice.txt0
-rw-r--r--[-rwxr-xr-x]indra/newview/linux_tools/client-readme.txt0
3 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/linux_tools/client-readme-joystick.txt b/indra/newview/linux_tools/client-readme-joystick.txt
index 4f89a73ccb..4f89a73ccb 100755..100644
--- a/indra/newview/linux_tools/client-readme-joystick.txt
+++ b/indra/newview/linux_tools/client-readme-joystick.txt
diff --git a/indra/newview/linux_tools/client-readme-voice.txt b/indra/newview/linux_tools/client-readme-voice.txt
index bfefdf3471..bfefdf3471 100755..100644
--- a/indra/newview/linux_tools/client-readme-voice.txt
+++ b/indra/newview/linux_tools/client-readme-voice.txt
diff --git a/indra/newview/linux_tools/client-readme.txt b/indra/newview/linux_tools/client-readme.txt
index e01b9e4bc6..e01b9e4bc6 100755..100644
--- a/indra/newview/linux_tools/client-readme.txt
+++ b/indra/newview/linux_tools/client-readme.txt