summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-20 20:48:16 -0500
committerOz Linden <oz@lindenlab.com>2011-01-20 20:48:16 -0500
commit4f3953763de478b15ec6adc5c468b19a0e13bfe8 (patch)
treedf9926a8ef0446a44bbb07126dafb7345760fd8c /indra/llcommon/llversionviewer.h
parentf9b9c7a5816cf0b9627a4a50e73a663667937145 (diff)
parentc47ab36b20e102a918257e5fa5452f13bc55a393 (diff)
merge changes from viewer-beta
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;