summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-21 10:22:13 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-03-21 10:22:13 -0700
commit15404a3c5d50f5f106f5bc443d16e172c54e3e0f (patch)
tree2e25cb610683043143bf8b871e2ddec1021039d3 /indra/llcommon/llversionviewer.h
parent07717a60dc3bce644dc08d7e8b2fa74715b9c7c0 (diff)
parentbe9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff)
Merge again
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 5a134b5009..15e3ffe1da 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 = 5;
-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";