summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-20 12:52:05 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-20 12:52:05 -0400
commit7be4856fde3a2b9e2caed4edf6bf65b55aea78b3 (patch)
tree0d0ec745767250f09f31af00c264fca21da626d8 /indra
parent07d4d9b01d11762926402f37faf8acd497acc5a7 (diff)
parentcbb184d986cbdd09d36cf2b2313726f0f2582cb2 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionviewer.h4
1 files changed, 2 insertions, 2 deletions
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";