summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-03-05 11:13:40 -0800
committerMerov Linden <merov@lindenlab.com>2013-03-05 11:13:40 -0800
commit96225b44247fc991d5ad2d856cde7d9f9aef412b (patch)
tree665d5f01c649b90715ed6513347656d637293ebf /indra
parent6600c6dcc910cc7468f9f9eaac42a5df0ccf75cf (diff)
parente03b1d89898433596604bb36d5ddfa64092ba91a (diff)
Pull from viewer-beta (version number update and tag)
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 6a5ff314e4..1554e9e665 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 3;
-const S32 LL_VERSION_MINOR = 4;
-const S32 LL_VERSION_PATCH = 6;
+const S32 LL_VERSION_MINOR = 5;
+const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";