summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
committerDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
commit954ebaed84f934437fc3a18c937f08fc527359e3 (patch)
tree93f6d2c12a93045db66337bdb17167f0b312b785 /indra/llcommon/llversionviewer.h
parent716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff)
parentb601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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";