diff options
author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
---|---|---|
committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/llcommon/llversionviewer.h | |
parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
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..0b0c74b3d3 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 = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |