From 16f6d79f769398bbb43f99de734257115a9608ca Mon Sep 17 00:00:00 2001 From: Dave Kaprielian Date: Wed, 9 Apr 2008 06:12:20 +0000 Subject: svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server --- indra/llcommon/llversionserver.h | 2 +- indra/llcommon/llversionviewer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 5da3c01096..9d98f945dd 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 20; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 83892; +const S32 LL_VERSION_BUILD = 84396; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7583bc28dd..8e964d3891 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 19; const S32 LL_VERSION_PATCH = 1; -const S32 LL_VERSION_BUILD = 4; +const S32 LL_VERSION_BUILD = 84396; const char * const LL_CHANNEL = "Second Life Release"; -- cgit v1.2.3