summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-29 19:19:24 -0400
committerOz Linden <oz@lindenlab.com>2011-03-29 19:19:24 -0400
commit9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (patch)
treef1e08f8c3ade8afc4c83a1574c0d54ac6c224ed1 /indra/llcommon/llversionviewer.h
parent32012f9fd4e9a5cb37f3a91d79873b79b9e6531e (diff)
parent6faf2f8ee101162fdb1fe5959204055c9885968f (diff)
merge changes for storm-1077
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 3838b2b16c..488ec5b239 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,7 +28,7 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 2;
-const S32 LL_VERSION_MINOR = 5;
+const S32 LL_VERSION_MINOR = 6;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 0;