diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/llcommon/llversionviewer.h | |
parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
parent | e4a4d75104916968ce03337094b1194e0daff438 (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 3838b2b16c..d22c879243 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 = 5; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |