From f5d50760d8d60deba17f209578b1c6416926eefd Mon Sep 17 00:00:00 2001 From: Josh Bell <josh@lindenlab.com> Date: Wed, 28 Nov 2007 23:12:57 +0000 Subject: [PATCH] Pick up patches from 1.18.6 production branch svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --- indra/llcommon/llversionserver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index d6e8a5ccfb8..9e1a8f53007 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; -const S32 LL_VERSION_PATCH = 5; -const S32 LL_VERSION_BUILD = 73054; +const S32 LL_VERSION_PATCH = 6; +const S32 LL_VERSION_BUILD = 74522; const char * const LL_CHANNEL = "Second Life Server"; -- GitLab