summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorsimon <none@none>2013-04-15 11:44:16 -0700
committersimon <none@none>2013-04-15 11:44:16 -0700
commit3e5fb382dd5fd896bd96320e9469286e582220c4 (patch)
tree645ac3dc29ff86337b2bc95b5338b2c9bc4a1080 /indra
parente01e2d30ff653bb7643d37b8c4e94b6b4de17d9b (diff)
parentb458923ea430880934f7fcc38a3e99e678e79b11 (diff)
Merge downstream code
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";