summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
commitf64a20ddcff91677b02b7688e08819cffb0989c9 (patch)
tree707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/llcommon/llversionviewer.h
parentc077250ff16aeaf0ec4c036154a427c677e85eb3 (diff)
parent17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff)
merge changes for storm-1016
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..117d96ffa6 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 = 1;
const S32 LL_VERSION_BUILD = 0;