summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/html/en-us/loading
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/skins/default/html/en-us/loading
parent8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff)
parent4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff)
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/skins/default/html/en-us/loading')
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/html/en-us/loading/loading.html0
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gifbin7426 -> 7426 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f73e..1c62d2f73e 100755..100644
--- a/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/indra/newview/skins/default/html/en-us/loading/loading.html
diff --git a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
index e3ccc7c769..e3ccc7c769 100755..100644
--- a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
+++ b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
Binary files differ