summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 18:16:06 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 18:16:06 -0800
commit4745afe679b0b835d602b22ea0df1b7e918888ac (patch)
tree7936879973a456e01d94a80b791c21e78c89fba7 /indra/llcommon
parent74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff)
parent1be900c1531e44c32fd8fd64e79aeb44e53a3c43 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionviewer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 8585af0a29..39f9de3bc2 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 3;
const S32 LL_VERSION_MINOR = 4;
-const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";