summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-19 12:48:04 -0500
committerOz Linden <oz@lindenlab.com>2011-01-19 12:48:04 -0500
commit061b04132ddf96dc55f962add8bf254bba54bd46 (patch)
treefc9b743ae37b198cd8199a8fcf2a906e55a82c64 /indra/llcommon/llversionviewer.h
parent6b7a7081c31607bada575dd2f0a226bc5d721fc2 (diff)
parentfde14fa53289d6bad4e3e91930115d7e249f71b8 (diff)
pull changes back from 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;