summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-15 12:02:58 -0700
commit3f64343b0b078e481c1c852ccd7201be6826a110 (patch)
tree8e82154ded91c169702e374d2e293712542805fd /indra/llcommon/llversionviewer.h
parentfa277a3b4a5d5dc5af6eb53ecd005e4789534758 (diff)
parent2c22863888eefbfb0f4245011be989d155583db7 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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 15e3ffe1da..7d5afe92dc 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 = 0;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";