summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorsimon <none@none>2013-04-15 11:22:45 -0700
committersimon <none@none>2013-04-15 11:22:45 -0700
commitb458923ea430880934f7fcc38a3e99e678e79b11 (patch)
tree81902df708145db6520ff6d1c817f1b23eca7cd7 /indra
parent066f2acadf6f1624fcdfc22263a890c370473887 (diff)
parentfac6ee27f2d3277494f011271064b0e5e7e02554 (diff)
Merge in viewer-development once more, 'cause it feels good
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 ae5e3ecade..0ea130e86b 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 = 1;
+const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 264760;
const char * const LL_CHANNEL = "Second Life Developer";