diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/llcommon/llversionviewer.h | |
parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) |
merge changes for storm-869
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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 356e0f4c0f..7d5afe92dc 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 = 5; +const S32 LL_VERSION_MINOR = 6; const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; |