summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-03-07 22:13:15 +0200
committermberezhnoy <mberezhnoy@productengine.com>2013-03-07 22:13:15 +0200
commit5957f1da916173d0e6463ebd3d74ff06a6df0c59 (patch)
tree8a618987a7e67ff183d6ec2a0ca515d5a8bf7935 /indra/llcommon
parent8e924c850569b8aa2d2765c6514d742f51f3392b (diff)
parent11199f2bef65f67f3ddd798944cb4ad62affa8ed (diff)
merge
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 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";