summaryrefslogtreecommitdiff
path: root/scripts/messages
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
committerOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
commit4d22c32aa9ac42b4a720200386d68339e8656974 (patch)
treec84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /scripts/messages
parent73e6711268adb93025386ffb766055125f0d849e (diff)
parent33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff)
merge changes for 3.5.2-beta4
Diffstat (limited to 'scripts/messages')
-rwxr-xr-x[-rw-r--r--]scripts/messages/message_template.msg0
-rwxr-xr-x[-rw-r--r--]scripts/messages/message_template.msg.sha10
2 files changed, 0 insertions, 0 deletions
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 6702de9b4a..6702de9b4a 100644..100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 7a31177f11..7a31177f11 100644..100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1