summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-02 11:28:41 -0400
committerOz Linden <oz@lindenlab.com>2013-04-02 11:28:41 -0400
commit5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (patch)
tree1b73d0d792c7d4bc9750b101d3dc9a6450cfe80d /indra
parentf61f5d1c10ee5bb493355ce9a96beb455199e8b3 (diff)
parent90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff)
merge changes for 3.5.0-beta7
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 1554e9e665..0b0c74b3d3 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 = 5;
-const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";