summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 14:06:20 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 14:06:20 -0800
commit3974d1eb9d922bfdde931c4daf94a3c48de62e9d (patch)
treeb2663185b38feabe4207ac70f15388a7dfb05049 /indra
parent2e015caf26fcba6ef44000588b5bad89118b63a9 (diff)
parent1be900c1531e44c32fd8fd64e79aeb44e53a3c43 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra')
-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";