From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers --- scripts/update_version_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/update_version_files.py') diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py index 077120127b..95ff19c65b 100755 --- a/scripts/update_version_files.py +++ b/scripts/update_version_files.py @@ -100,7 +100,7 @@ re_map['indra/llcommon/llversionserver.h'] = \ 'const S32 LL_VERSION_BUILD = %(SERVER_VER_BUILD)s;'), ('const char \* const LL_CHANNEL = "(.+)";', 'const char * const LL_CHANNEL = "%(SERVER_CHANNEL)s";')) -re_map['indra/newview/res/newViewRes.rc'] = \ +re_map['indra/newview/res/viewerRes.rc'] = \ (('FILEVERSION [0-9,]+', 'FILEVERSION %(VER_MAJOR)s,%(VER_MINOR)s,%(VER_PATCH)s,%(VER_BUILD)s'), ('PRODUCTVERSION [0-9,]+', -- cgit v1.2.3