Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts:

	ChangeLog.txt
	linden/indra/llcommon/llversionviewer.h

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
index 46587e8..3d66a65 100755
--- a/linden/scripts/build_version.py
+++ b/linden/scripts/build_version.py
@@ -26,8 +26,10 @@ def get_version(filename):
     vals['minor'] = m.group(1)
     m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', data)
     vals['patch'] = m.group(1)
+    m = re.search('const char \* const IMP_VERSION_TEST = "(.+)";', data)
+    vals['test'] = m.group(1)
 
-    return "%(major)s.%(minor)s.%(patch)s" % vals
+    return "%(major)s.%(minor)s.%(patch)s-%(test)s" % vals
 
 if __name__ == '__main__':
     import sys