summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
committerOz Linden <oz@lindenlab.com>2011-01-27 13:01:55 -0500
commit3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch)
treea461ec6fc7412cff158635afffb0c4336fcac470 /indra/llcommon/llversionviewer.h
parent3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff)
parent3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff)
merge changes for beta fixes
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 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;