diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-28 23:12:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-28 23:12:57 +0000 |
| commit | f5d50760d8d60deba17f209578b1c6416926eefd (patch) | |
| tree | bb4865afc4800228c9470d5552869a71e4a21899 /indra/llcommon | |
| parent | 75daa1287293740d9feea14e012ca9203ac9f006 (diff) | |
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
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index d6e8a5ccfb..9e1a8f5300 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"; |