summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-07-16 20:29:28 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-07-16 20:29:28 +0000
commit7964c6f7a5b622d698f7d471690b29122966b1b2 (patch)
tree78a708bc316db2e2ff3047089a3edf8020c4d7cb /scripts
parent88d7d45316186af931285b7f03d2a78cd04f888f (diff)
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/template_verifier.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index 83f3ae61f5..980ceb8df8 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -22,8 +22,8 @@ import os
import sys
import urllib
-from indra import compatibility
-from indra import llmessage
+from indra.ipc import compatibility
+from indra.ipc import llmessage
def die(msg):
print >>sys.stderr, msg