diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:52:05 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:52:05 -0400 |
| commit | 7be4856fde3a2b9e2caed4edf6bf65b55aea78b3 (patch) | |
| tree | 0d0ec745767250f09f31af00c264fca21da626d8 | |
| parent | 07d4d9b01d11762926402f37faf8acd497acc5a7 (diff) | |
| parent | cbb184d986cbdd09d36cf2b2313726f0f2582cb2 (diff) | |
Automated merge up from viewer-development
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -33,3 +33,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3 00a831292231faad7e44c69f76cb96f175b8dfad 2.2.0-beta4 98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-beta1 1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release +98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-start diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index bd65ce8573..9391aed8a1 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 = 2; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_MINOR = 4; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |