summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-05-20 11:41:28 -0400
committerLoren Shih <seraph@lindenlab.com>2011-05-20 11:41:28 -0400
commit781addcbc1c7611153ff58fd2f28062a1c4cd041 (patch)
treecebb3af3706fb6c9690562562201a468c56b97b4 /indra/llcommon
parent19a06478d9863c451450b7c9e2f931ba587a3cec (diff)
parentce248b92d77e781d159f3838b5a2b5ef96360138 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llversionviewer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 79124a5a37..7703132d90 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
#define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 2;
-const S32 LL_VERSION_MINOR = 6;
-const S32 LL_VERSION_PATCH = 9;
+const S32 LL_VERSION_MINOR = 7;
+const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";