summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 06:59:13 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 06:59:13 -0400
commit8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (patch)
tree0368edab036f87a93a21bcd0fdd635dd749d6fc0 /indra/llcommon/llversionviewer.h
parent2453ccbd3ee10a4f845e98fb51aac6c1e4bca5a5 (diff)
parentf122d0939060fd597820a71d85a5c0d839bcff5d (diff)
merge changes for storm-659
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 3838b2b16c..117d96ffa6 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 = 3;
+const S32 LL_VERSION_MINOR = 6;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";