summaryrefslogtreecommitdiff
path: root/scripts/templates
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-19 17:59:55 -0500
committerOz Linden <oz@lindenlab.com>2013-11-19 17:59:55 -0500
commit0031e9a97be1bf6e9fe773c23506494d09ce91ae (patch)
tree220f195c82174b7cc8e94dceb2553e59fe5837a5 /scripts/templates
parentb7edc965bc77ab21e9a1e3f6b424299a50053529 (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
merge up to 3.6.10-release; some of the storm-68 changes lost
Diffstat (limited to 'scripts/templates')
-rwxr-xr-x[-rw-r--r--]scripts/templates/template-cpp.cpp0
-rwxr-xr-x[-rw-r--r--]scripts/templates/template-h.h0
2 files changed, 0 insertions, 0 deletions
diff --git a/scripts/templates/template-cpp.cpp b/scripts/templates/template-cpp.cpp
index 35d8441c87..35d8441c87 100644..100755
--- a/scripts/templates/template-cpp.cpp
+++ b/scripts/templates/template-cpp.cpp
diff --git a/scripts/templates/template-h.h b/scripts/templates/template-h.h
index ce7b4ddc87..ce7b4ddc87 100644..100755
--- a/scripts/templates/template-h.h
+++ b/scripts/templates/template-h.h