summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-04-15 15:57:57 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-04-15 15:57:57 -0700
commitddd599b3473609788e430adf1895b12a5cb35375 (patch)
treec41da37ab77e25cfc76d85448c51103a7b55e2ca /indra/llcommon
parentebe0c8204df30a85b8228e81acbcf7945c15220c (diff)
parent411a1bfcb6e6f7c0bc6e8afcf8aed447426df340 (diff)
Merge
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 488ec5b239..bd6df962a1 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 6;
-const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";