summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
committerKitty Barnett <develop@catznip.com>2012-12-18 21:57:25 +0100
commitc309a7bd9446cc942830998b1f5873cc62e9dffb (patch)
treebbfe0d41ebc7e303db1bd95c419f604e04fb9ab2 /indra/llcommon
parentca790f7320c9fc6c43e8c6022c9e511a85fd1c9d (diff)
parent3feacc96c6cf87f1be034312d8c71d21bae88351 (diff)
Merge with viewer-materials tip
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";