summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-07 16:44:38 -0500
committerOz Linden <oz@lindenlab.com>2011-01-07 16:44:38 -0500
commit8a939212f4afef41c83cc35a14d7f2c2ee3ce6ba (patch)
tree5df698253963026fe43bb19f69507d4528c539dd /indra/llcommon/llversionviewer.h
parent346082965ac922a90f7c24bd97be807906b6a35f (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
merge changes for storm-826
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;