diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/llcommon | |
parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) |
merge fixes for STORM-432
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 b209e4aa38..d6fa5b1997 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,7 +28,7 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 4; +const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; |