summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-07 16:39:38 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-03-07 16:39:38 -0800
commita07e6c625108988ad664df70a1842b53c843f223 (patch)
treeed1816bf0794eca05b06580ea6cbbf2f8f8652b5 /indra/llcommon/llversionviewer.h
parenta6ff010dc1bee1b526fd8a83f9ef71d1e51bd082 (diff)
parentbe9bae601cfba3a94dfdcce4a6770cbb328681b6 (diff)
Merge branches
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";