summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-04 15:26:56 -0400
committerOz Linden <oz@lindenlab.com>2011-04-04 15:26:56 -0400
commit94aa24a89ee96689633fad4e7250f6f81b6b76c1 (patch)
tree58eaa9b1e6af1eea6aedffe51d758f177217f172 /indra/llcommon/llversionviewer.h
parent1a2cc89cc59d92e768e109a1a822bfedfd9aaf01 (diff)
parente952f77a505cf274ca0b3ea95b504a51e757806a (diff)
merge changes for social-859
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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 117d96ffa6..d22c879243 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 = 1;
+const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";