summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-06 12:01:40 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-06 12:01:40 -0800
commit6953be640f075bebd218bc1f6c026f720e677b5f (patch)
tree1cede72c3b55f16ff4c4ca348a3e6e0f7f6cca91 /indra/llcommon/llversionviewer.h
parentf135503a9ed99f5e9b009a6608a9c4bc21c5e8cf (diff)
parent236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (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 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";