summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:39 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-10 11:20:39 -0500
commitfdf19a526821291bd3d6a6e1f6b78dcaeac63705 (patch)
tree840aacb00347dade197ad74862fdec9be513749d /indra/llcommon
parentc4989c17ed3848f676364e1927ccad13fb628e2c (diff)
parent964e981458234aed37252a7b484f6f6765fff50d (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionviewer.h2
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;