summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
committerOz Linden <oz@lindenlab.com>2013-03-13 15:15:15 -0400
commit75722baf295aff7927bff3c70cdf0ec27399cb37 (patch)
treea7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/llcommon/llversionviewer.h
parent5c68b2456e8603322a1f12694c196246752bab53 (diff)
parentd348deb7049cbaef7c228000525c7ee5a265464c (diff)
merge changes for latest viewer-development
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 8585af0a29..0b0c74b3d3 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 = 4;
+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";