diff options
author | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
---|---|---|
committer | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
commit | d5561a1ada5cf171c8e281e910a7e989496c3705 (patch) | |
tree | 456cbb2374242d5508cc13165c876cd0672f6cd0 /indra/llcommon/llversionviewer.h | |
parent | a8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff) | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) |
Merge in viewer-beta to get CHUI code
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 6a5ff314e4..1554e9e665 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 3; -const S32 LL_VERSION_MINOR = 4; -const S32 LL_VERSION_PATCH = 6; +const S32 LL_VERSION_MINOR = 5; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |