summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-01-11 16:42:24 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-01-11 16:42:24 -0500
commit86482ce1d7dbd01e1ebad4d18565bd979a11aa30 (patch)
tree8f77212384a9302d24cde4d196e6443273ceba20 /indra/llcommon
parent997c0d3924015910b62acaa85e46844fcfb43ec0 (diff)
parent3fcdd7f41581e2e724be703687e717ea6ddc91ba (diff)
merge
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 356e0f4c0f..7d5afe92dc 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 = 0;
const S32 LL_VERSION_BUILD = 0;