diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
| commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
| tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/llcommon/llversionviewer.h | |
| parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
| parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) | |
merge changes for storm-1064
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 15e3ffe1da..117d96ffa6 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 = 2; +const S32 LL_VERSION_MINOR = 6; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |