summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 13:50:39 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 13:50:39 -0500
commit5098ca5ae444ca492bc668fbd07976e96eb5726a (patch)
treef392ec41ad1c3a44287dfff5efe6997962b9c4fc /indra/llcommon
parent37116479d299f23a289e39accc3899d6ea977203 (diff)
parent6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff)
merge fix for STORM-557
Diffstat (limited to 'indra/llcommon')
-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 b209e4aa38..d6fa5b1997 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 = 4;
+const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;