summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 18:52:15 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 18:52:15 -0500
commit65ca5968cd59663c3567287c14ce506e37c085c4 (patch)
treeb74325f43d5757fdab1ce607b4f6aff94529e7b3 /indra/llcommon/llversionviewer.h
parent49e28d324066add8cca44e27806b8077d3b0c542 (diff)
parentcba34d7d4cdb0339113a4798965d595645d5cb49 (diff)
Automated merge with file:///Users/oz/Work/viewer-vs2010
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 7d5afe92dc..7703132d90 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 = 6;
+const S32 LL_VERSION_MINOR = 7;
const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;