summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
committerOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
commita4913246770b58ed569021c484c213231aaae549 (patch)
tree0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/llcommon
parent80c2abddcfbcb578e70d220baa95aebdee3d529c (diff)
parentb2b446aed7f7f32151bc152ba25d44253ebf864f (diff)
merge up to latest viewer-release
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 26ff1b5c55..fafc750690 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 = 3;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";