diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/llcommon | |
parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) |
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index ae2bd0d78b..bd6df962a1 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 4; +const S32 LL_VERSION_PATCH = 5; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |