summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-15 10:13:09 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-15 10:13:09 -0500
commit2d8e34c788ce3c9c95028bc989341fd17630a8a8 (patch)
tree6834324312a4e21bb66138d4dfa271e25b623467 /indra
parentcf728ab09ec12c73e95b8e2304a3b69c9460182e (diff)
parent3555849644ff228a189dd2a21e57def22f142e5d (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra')
-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;