summaryrefslogtreecommitdiff
path: root/indra/llplugin/slplugin/slplugin.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2015-12-22 11:07:18 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2015-12-22 11:07:18 +0200
commit60dfd55edaa5df0cb864dc5086037bc5625bc0be (patch)
tree7140d0f8eddc02e7ee71fa03fc9aa4aa652cd476 /indra/llplugin/slplugin/slplugin.cpp
parent6e6d610a9905c1bceb9dd073c3eed87574fdcb29 (diff)
parent7b993d15b70d419dc0a7c8d92286d34a2635537d (diff)
Merge downstream, version 4.0.1
Diffstat (limited to 'indra/llplugin/slplugin/slplugin.cpp')
-rwxr-xr-xindra/llplugin/slplugin/slplugin.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index 6c9ba0ae52..684bcf1207 100755
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -310,4 +310,3 @@ int main(int argc, char **argv)
return 0;
}
-