summaryrefslogtreecommitdiff
path: root/scripts/messages
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
commit73f474d886d2430db3d5c8f7729f769b389730a4 (patch)
tree5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /scripts/messages
parent81ffd3fccac709a5903dd0d7572db50c50850347 (diff)
parent180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff)
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
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