summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-07 09:35:57 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-03-07 09:35:57 -0800
commitfa4986e9781651626a6a467057509d653d98cf40 (patch)
tree8ac6428b1aa0ad79e3ea52c9734d8202f169988b /indra/llcommon
parentd413799644b8e7fa943fa86c7798634a28ce335d (diff)
parent5cb2d63979f0ff72cb9351dc9aa070b1990a1f9c (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llcommon')
-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 7703132d90..5a134b5009 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 = 7;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_MINOR = 5;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";