summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-06-27 10:15:24 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-06-27 10:15:24 -0700
commitd40bd76ec76bf7d2fa59d15f5c71125c9813f31e (patch)
tree5e47be32903db5e8ff5520bd7ec46aad2f43adad /indra/llcommon
parent398019ffb2a036813c6c89a677e9534faa178330 (diff)
parent5c9fc7d24f0d060bcb86ed5b03cb9ba9c7282038 (diff)
Merge viewer 2.7.6 from trunk
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 92cd9bd46a..69720bb903 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 = 7;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";