diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-08 01:36:15 +0000 |
commit | 127c45dfbab4550ebd7074f131e3a7b844affea8 (patch) | |
tree | 4e53a71899f03bd8de1028231f025c7355df7f11 /indra/llcommon/llversionviewer.h | |
parent | cb7ae391efed1cadab621734c6eb53fd62df19a4 (diff) | |
parent | a07e6c625108988ad664df70a1842b53c843f223 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7703132d90..15e3ffe1da 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 7; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_MINOR = 5; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |