summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-04-14 18:27:31 +0000
committerDon Kjer <don@lindenlab.com>2011-04-14 18:27:31 +0000
commit01f4570c795b197e74bfa96139631c43df8d0664 (patch)
tree7c1952cc51adec21025f537281e59f828e75224d /indra/llcommon
parent2bf967149626672584b17b53fb5d2e6186f3d896 (diff)
parent88a7262340f2fc5085f4ac6600790518d01292d6 (diff)
Merge with 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 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";