summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-04-26 18:01:18 +0000
committerDon Kjer <don@lindenlab.com>2011-04-26 18:01:18 +0000
commitc14b5c644d75df31a1ef151262480cf875134da2 (patch)
tree9284620a254873585b637f625456c88e9e371436 /indra/llcommon
parent77791a88a9811f71cc9af668d28a903645436be0 (diff)
parentb87cb90a55ed74d51587eec581fb57e29f510c41 (diff)
Merge with viewer-development
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 df5afcbf1c..58f96df8ab 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 6;
-const S32 LL_VERSION_PATCH = 6;
+const S32 LL_VERSION_PATCH = 7;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";