summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 12:10:03 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 12:10:03 -0400
commit290423764dc48e70205cc0d28187d9d8fe3c8dff (patch)
tree89a5814cb8aa25d1ead942b5e0221df5e7e832fe /indra/llcommon/llversionviewer.h
parentb5be90d0d2f26792f0044286f9b64126446dc101 (diff)
parenta300902494f76b9542c3978c2ca80726cefbc942 (diff)
merge out latest viewer-development
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 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";