diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-27 19:48:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-27 19:48:41 +0000 |
| commit | 75daa1287293740d9feea14e012ca9203ac9f006 (patch) | |
| tree | 0a427ebd7a8cd23d59ca031727914703eeb41b32 /indra | |
| parent | ecc4b297e5daa3d74c245e5e8c96cf0a03c33e5b (diff) | |
svn merge -r 72903:73200 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
Missed merge range in release r74199. Josh is an idiot.
Diffstat (limited to 'indra')
| -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 8a2f8835f5..d6e8a5ccfb 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 = 3; -const S32 LL_VERSION_BUILD = 72163; +const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_BUILD = 73054; const char * const LL_CHANNEL = "Second Life Server"; |