summaryrefslogtreecommitdiff
path: root/indra/newview/SecondLife.nib
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-06-26 17:39:23 +0100
committerIma Mechanique <ima.mechanique@secondlife.com>2013-06-26 17:39:23 +0100
commitb615858d6c41c29b3b610ec0dba09f30b1f8b3a8 (patch)
tree2b193625c9ed4a0ca36e5b5f99f1cc765e979d74 /indra/newview/SecondLife.nib
parente63d92ab504d74399cae2a9cc7625ef3ec330c38 (diff)
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
Merging last four months of development
Diffstat (limited to 'indra/newview/SecondLife.nib')
-rwxr-xr-x[-rw-r--r--]indra/newview/SecondLife.nib/classes.nib0
-rwxr-xr-x[-rw-r--r--]indra/newview/SecondLife.nib/info.nib0
-rwxr-xr-x[-rw-r--r--]indra/newview/SecondLife.nib/objects.xib0
3 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/SecondLife.nib/classes.nib b/indra/newview/SecondLife.nib/classes.nib
index ea58db1189..ea58db1189 100644..100755
--- a/indra/newview/SecondLife.nib/classes.nib
+++ b/indra/newview/SecondLife.nib/classes.nib
diff --git a/indra/newview/SecondLife.nib/info.nib b/indra/newview/SecondLife.nib/info.nib
index 1b531de104..1b531de104 100644..100755
--- a/indra/newview/SecondLife.nib/info.nib
+++ b/indra/newview/SecondLife.nib/info.nib
diff --git a/indra/newview/SecondLife.nib/objects.xib b/indra/newview/SecondLife.nib/objects.xib
index b7ff30f2b2..b7ff30f2b2 100644..100755
--- a/indra/newview/SecondLife.nib/objects.xib
+++ b/indra/newview/SecondLife.nib/objects.xib